Merge branch 'master' into WaitForNatsServerMasterEdition

.drone.env

@@ -1,3 +1,3 @@
 # The test runner source for API tests
-CORE_COMMITID=62aed7f062939156d995df4288e277e4a8a17fd6
+CORE_COMMITID=4512f46e7196a8c1f1cfc56ec397628cbf540407
 CORE_BRANCH=master

.drone.star

@@ -29,7 +29,7 @@ def lintStep():
         "name": "lint",
         "image": "registry.cern.ch/docker.io/golangci/golangci-lint:v1.42.1",
         "commands": [
-            "golangci-lint run --timeout 2m0s",
+            "golangci-lint run --timeout 3m0s",
         ],
     }
 

Dockerfile.revad-ceph

@@ -16,7 +16,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM ceph/daemon-base
+FROM quay.ceph.io/ceph-ci/ceph:pacific
 
 RUN dnf update -y && dnf install -y \
   git \

Makefile

@@ -70,7 +70,7 @@ litmus-test-new: build
 	pkill revad
 lint:
 	go run tools/check-license/check-license.go
-	`go env GOPATH`/bin/golangci-lint run --timeout 2m0s
+	`go env GOPATH`/bin/golangci-lint run --timeout 3m0s
 
 contrib:
 	git shortlog -se | cut -c8- | sort -u | awk '{print "-", $$0}' | grep -v 'users.noreply.github.com' > CONTRIBUTORS.md

changelog/unreleased/cephfs-fix-base.md

@@ -0,0 +1,6 @@
+Bugfix: Dockerfile.revad-ceph to use the right base image
+
+In Aug2021 https://hub.docker.com/r/ceph/daemon-base was moved to quay.ceph.io
+and the builds for this image were failing for some weeks after January.
+
+https://github.com/cs3org/reva/pull/2588

changelog/unreleased/eos-sys-acl-files.md

@@ -0,0 +1,3 @@
+Enhancement: Use sys ACLs for file permissions
+
+https://github.com/cs3org/reva/pull/2494

changelog/unreleased/honour-tracing-service-name.md

@@ -0,0 +1,3 @@
+Bugfix: respect the tracing_service_name config variable
+
+https://github.com/cs3org/reva/pull/2608

changelog/unreleased/mentix-prom-ext.md

@@ -0,0 +1,5 @@
+Enhancement: Mentix PromSD extensions
+
+The Mentix Prometheus SD scrape targets are now split into one file per service type, making health checks configuration easier. Furthermore, the local file connector for mesh data and the site registration endpoint have been dropped, as they aren't needed anymore.
+
+https://github.com/cs3org/reva/pull/2560

cmd/revad/runtime/runtime.go

@@ -149,7 +149,7 @@ func initServers(mainConf map[string]interface{}, log *zerolog.Logger) map[strin
 }
 
 func initTracing(conf *coreConf) {
-	rtrace.SetTraceProvider(conf.TracingCollector, conf.TracingEndpoint)
+	rtrace.SetTraceProvider(conf.TracingCollector, conf.TracingEndpoint, conf.TracingServiceName)
 }
 
 func initCPUCount(conf *coreConf, log *zerolog.Logger) {

docs/content/en/docs/config/http/services/mentix/_index.md

@@ -43,17 +43,13 @@ _Supported connectors:_
 
 - **gocdb** 
 The [GOCDB](https://wiki.egi.eu/wiki/GOCDB/Documentation_Index) is a database specifically designed to organize the topology of a mesh of distributed sites and services. In order to use GOCDB with Mentix, its instance address has to be configured (see [here](gocdb)).
-
-- **localfile**
-The [localfile](localfile) connector reads sites from a local JSON file. The file must contain an array of sites adhering to the `meshdata.Site` structure.
 
 ## Importers
 Mentix can import mesh data from various sources and write it to one or more targets through the corresponding connectors.
 
 __Supported importers:__
 
-- **sitereg**
-Mentix can import new sites via an HTTP endpoint using the `sitereg` importer. Data can be sent to the configured relative endpoint (see [here](sitereg)).
+- **None**
 
 ## Exporters
 Mentix exposes its gathered data by using one or more _exporters_. Such exporters can, for example, write the data to a file in a specific format, or offer the data via an HTTP endpoint.

docs/content/en/docs/config/http/services/mentix/promsd/_index.md

@@ -10,19 +10,11 @@ description: >
 When using the Prometheus SD exporter, the output filenames have to be configured first.
 {{% /pageinfo %}}
 
-{{% dir name="metrics_output_file" type="string" default="" %}}
-The target filename of the generated Prometheus File SD scrape config for metrics.
+{{% dir name="output_path" type="string" default="" %}}
+The target path of the generated Prometheus File SD scrape configs for metrics.
 {{< highlight toml >}}
 [http.services.mentix.exporters.promsd]
-metrics_output_file = "/var/shared/prometheus/sciencemesh.json"
-{{< /highlight >}}
-{{% /dir %}}
-
-{{% dir name="blackbox_output_file" type="string" default="" %}}
-The target filename of the generated Prometheus File SD scrape config for the blackbox exporter.
-{{< highlight toml >}}
-[http.services.mentix.exporters.promsd]
-blackbox_output_file = "/var/shared/prometheus/blackbox.json"
+output_path = "/var/shared/prometheus/sciencemesh"
 {{< /highlight >}}
 {{% /dir %}}
 

docs/content/en/docs/config/packages/auth/manager/oidcmapping/_index.md

@@ -56,24 +56,16 @@ gatewaysvc = ""
 {{< /highlight >}}
 {{% /dir %}}
 
-{{% dir name="userprovidersvc" type="string" default="" %}}
-The endpoint at which the GRPC userprovider is exposed. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidcmapping/oidcmapping.go#L65)
-{{< highlight toml >}}
-[auth.manager.oidcmapping]
-userprovidersvc = ""
-{{< /highlight >}}
-{{% /dir %}}
-
 {{% dir name="users_mapping" type="string" default="" %}}
- The optional OIDC users mapping file path [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidcmapping/oidcmapping.go#L66)
+ The optional OIDC users mapping file path [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidcmapping/oidcmapping.go#L65)
 {{< highlight toml >}}
 [auth.manager.oidcmapping]
 users_mapping = ""
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="group_claim" type="string" default="" %}}
- The group claim to be looked up to map the user (default to 'groups'). [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidcmapping/oidcmapping.go#L67)
+ The group claim to be looked up to map the user (default to 'groups'). [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidcmapping/oidcmapping.go#L66)
 {{< highlight toml >}}
 [auth.manager.oidcmapping]
 group_claim = ""

examples/mentix/mentix.toml

@@ -8,10 +8,6 @@ update_interval = "15m"
 address = "http://sciencemesh-test.uni-muenster.de"
 apikey = "abc123"
 
-# Sites can also be stored in a local file
-[http.services.mentix.connectors.localfile]
-file = "/usr/share/revad/sites.json"
-
 # Configure the service types that are considered as critical/essential
 [http.services.mentix.services]
 critical_types = ["REVAD"]
@@ -28,13 +24,6 @@ enabled_connectors = ["gocdb"]
 # Enable the Metrics exporter
 [http.services.mentix.exporters.metrics]
 
-# Enable the site registration importer
-[http.services.mentix.importers.sitereg]
-# For importers, this is obligatory; the connectors will be used as the target for data updates
-enabled_connectors = ["localfile"]
-# If set to true, ScienceMesh sites will be ignored when they try to register
-ignore_sm_sites = false
-
 # Set up the accounts service used to query information about accounts associated with registered sites
 [http.services.mentix.accounts]
 # Depending on where the service is running, localhost may also be used here
@@ -44,7 +33,6 @@ password = "userpass"
 
 # Configure the Prometheus Service Discovery:
 [http.services.mentix.exporters.promsd]
-# The following files must be made available to Prometheus.
-# They can then be used as the file_sd source of a job.
-metrics_output_file = "/usr/share/prom/sciencemesh_metrics.json"
-blackbox_output_file = "/usr/share/prom/sciencemesh_blackbox.json"
+# The following path must be made available to Prometheus.
+# The contained target files can then be used as the file_sd sources of a job.
+output_path = "/usr/share/prom"

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/bluele/gcache v0.0.2
 	github.com/c-bata/go-prompt v0.2.5
 	github.com/cenkalti/backoff v2.2.1+incompatible
-	github.com/ceph/go-ceph v0.13.0
+	github.com/ceph/go-ceph v0.14.0
 	github.com/cheggaaa/pb v1.0.29
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e
@@ -25,7 +25,7 @@ require (
 	github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59
 	github.com/gdexlab/go-render v1.0.1
 	github.com/go-chi/chi/v5 v5.0.7
-	github.com/go-ldap/ldap/v3 v3.4.1
+	github.com/go-ldap/ldap/v3 v3.4.2
 	github.com/go-openapi/errors v0.20.1 // indirect
 	github.com/go-openapi/strfmt v0.20.2 // indirect
 	github.com/go-sql-driver/mysql v1.6.0
@@ -45,12 +45,12 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.10
 	github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b
 	github.com/mileusna/useragent v1.0.2
-	github.com/minio/minio-go/v7 v7.0.21
+	github.com/minio/minio-go/v7 v7.0.23
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.3
-	github.com/nats-io/nats-server/v2 v2.7.2
-	github.com/nats-io/nats-streaming-server v0.24.1
+	github.com/nats-io/nats-server/v2 v2.7.3
+	github.com/nats-io/nats-streaming-server v0.24.2
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.18.0
 	github.com/pkg/errors v0.9.1
@@ -70,18 +70,18 @@ require (
 	go-micro.dev/v4 v4.3.1-0.20211108085239-0c2041e43908
 	go.mongodb.org/mongo-driver v1.7.2 // indirect
 	go.opencensus.io v0.23.0
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0
-	go.opentelemetry.io/otel v1.3.0
-	go.opentelemetry.io/otel/exporters/jaeger v1.3.0
-	go.opentelemetry.io/otel/sdk v1.3.0
-	go.opentelemetry.io/otel/trace v1.3.0
-	golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0
+	go.opentelemetry.io/otel v1.4.1
+	go.opentelemetry.io/otel/exporters/jaeger v1.4.1
+	go.opentelemetry.io/otel/sdk v1.4.1
+	go.opentelemetry.io/otel/trace v1.4.1
+	golang.org/x/crypto v0.0.0-20220214200702-86341886e292
 	golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
+	golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7
 	golang.org/x/term v0.0.0-20210916214954-140adaaadfaf
 	google.golang.org/genproto v0.0.0-20211021150943-2b146023228c
-	google.golang.org/grpc v1.42.0
+	google.golang.org/grpc v1.44.0
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gotest.tools v2.2.0+incompatible