From beb8cea84d7d05dba67f6f28f6ea7883543d63c1 Mon Sep 17 00:00:00 2001 From: Aman Mangal Date: Wed, 23 Apr 2025 16:58:41 +0530 Subject: [PATCH] remove telemetry from alpha and push very basic telemetry in zero --- .../alpha/mutations_mode/docker-compose.yml | 6 +- dgraph/cmd/alpha/run.go | 9 +- dgraph/cmd/zero/run.go | 1 - dgraph/cmd/zero/zero.go | 40 +++--- dgraph/docker-compose.yml | 30 ++--- edgraph/server.go | 32 ----- .../poorman_auth/docker-compose.yml | 7 +- .../poorman_auth_with_acl/docker-compose.yml | 6 +- graphql/e2e/auth/debug_off/docker-compose.yml | 6 +- graphql/e2e/auth/docker-compose.yml | 8 +- .../auth_closed_by_default/docker-compose.yml | 8 +- graphql/e2e/custom_logic/docker-compose.yml | 5 +- graphql/e2e/directives/docker-compose.yml | 6 +- graphql/e2e/multi_tenancy/docker-compose.yml | 15 +-- graphql/e2e/normal/docker-compose.yml | 6 +- graphql/e2e/schema/docker-compose.yml | 15 +-- graphql/e2e/subscription/docker-compose.yml | 15 +-- .../custom_bench/profiling/docker-compose.yml | 4 +- ocagent/docker-compose.yml | 4 +- systest/1million/alpha.yml | 4 +- systest/21million/bulk/alpha.yml | 4 +- systest/21million/live/docker-compose.yml | 4 +- systest/acl/restore/docker-compose.yml | 6 +- systest/audit/docker-compose.yml | 4 +- systest/audit_encrypted/docker-compose.yml | 7 +- .../127-Namespace/docker-compose.yml | 12 +- .../acl-nonAcl/docker-compose.yml | 20 +-- .../deleted-namespace/docker-compose.yml | 12 +- systest/backup/encryption/docker-compose.yml | 12 +- systest/backup/filesystem/docker-compose.yml | 24 ++-- systest/backup/minio-large/docker-compose.yml | 24 ++-- systest/backup/minio/docker-compose.yml | 24 ++-- .../backup/multi-tenancy/docker-compose.yml | 18 +-- systest/backup/nfs-backup/docker-compose.yml | 16 +-- systest/bgindex/docker-compose.yml | 5 +- systest/bulk_live/bulk/alpha.yml | 4 +- systest/bulk_live/bulk/alpha_acl.yml | 5 +- systest/bulk_live/live/docker-compose.yml | 5 +- systest/cdc/docker-compose.yml | 5 +- systest/cloud/docker-compose.yml | 6 +- systest/export/docker-compose.yml | 15 +-- systest/group-delete/docker-compose.yml | 15 +-- systest/ldbc/alpha.yml | 5 +- systest/loader/docker-compose.yml | 8 +- systest/multi-tenancy/docker-compose.yml | 6 +- systest/online-restore/docker-compose.yml | 54 ++++---- systest/plugin/docker-compose.yml | 3 +- telemetry/telemetry.go | 127 ------------------ testutil/testaudit/docker-compose.yml | 7 +- tlstest/acl/docker-compose.yml | 4 +- tlstest/certrequest/docker-compose.yml | 8 +- .../certrequireandverify/docker-compose.yml | 9 +- tlstest/certverifyifgiven/docker-compose.yml | 7 +- .../ha_6_node/docker-compose.yml | 24 ++-- .../multi_group/docker-compose.yml | 24 ++-- .../single_node/docker-compose.yml | 8 +- .../all_routes_tls/docker-compose.yml | 5 +- tlstest/zero_https/no_tls/docker-compose.yml | 5 +- worker/docker-compose.yml | 48 +++---- 59 files changed, 316 insertions(+), 510 deletions(-) delete mode 100644 telemetry/telemetry.go diff --git a/dgraph/cmd/alpha/mutations_mode/docker-compose.yml b/dgraph/cmd/alpha/mutations_mode/docker-compose.yml index 32556128a02..251f8e5ad86 100644 --- a/dgraph/cmd/alpha/mutations_mode/docker-compose.yml +++ b/dgraph/cmd/alpha/mutations_mode/docker-compose.yml @@ -17,7 +17,7 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=disallow;" alpha2: @@ -34,7 +34,7 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=strict;" alpha3: @@ -51,7 +51,7 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=strict;" zero1: diff --git a/dgraph/cmd/alpha/run.go b/dgraph/cmd/alpha/run.go index 5c00259a828..12bb4761cde 100644 --- a/dgraph/cmd/alpha/run.go +++ b/dgraph/cmd/alpha/run.go @@ -612,9 +612,8 @@ func setupServer(closer *z.Closer) { } func run() { - var err error - - telemetry := z.NewSuperFlag(Alpha.Conf.GetString("telemetry")). + // keeping this flag for backward compatibility + _ = z.NewSuperFlag(Alpha.Conf.GetString("telemetry")). MergeAndCheckDefault(x.TelemetryDefaults) bindall = Alpha.Conf.GetBool("bindall") @@ -712,10 +711,6 @@ func run() { } x.WorkerConfig.Parse(Alpha.Conf) - if telemetry.GetBool("reports") { - go edgraph.PeriodicallyPostTelemetry() - } - // Set the directory for temporary buffers. z.SetTmpDir(x.WorkerConfig.TmpDir) diff --git a/dgraph/cmd/zero/run.go b/dgraph/cmd/zero/run.go index dce58f0fcad..3712caccd73 100644 --- a/dgraph/cmd/zero/run.go +++ b/dgraph/cmd/zero/run.go @@ -199,7 +199,6 @@ func (st *state) serveGRPC(l net.Listener, store *raftwal.DiskStorage) { } func run() { - // keeping this flag for backward compatibility telemetry := z.NewSuperFlag(Zero.Conf.GetString("telemetry")). MergeAndCheckDefault(x.TelemetryDefaults) diff --git a/dgraph/cmd/zero/zero.go b/dgraph/cmd/zero/zero.go index cbb65a8dc10..f1fdfac5aab 100644 --- a/dgraph/cmd/zero/zero.go +++ b/dgraph/cmd/zero/zero.go @@ -10,6 +10,8 @@ import ( "crypto/tls" "fmt" "math" + "net/http" + "runtime" "sync" "time" @@ -23,7 +25,6 @@ import ( "github.com/dgraph-io/ristretto/v2/z" "github.com/hypermodeinc/dgraph/v25/conn" "github.com/hypermodeinc/dgraph/v25/protos/pb" - "github.com/hypermodeinc/dgraph/v25/telemetry" "github.com/hypermodeinc/dgraph/v25/x" ) @@ -98,34 +99,39 @@ func (s *Server) Init() { } func (s *Server) periodicallyPostTelemetry() { - glog.V(2).Infof("Starting telemetry data collection for zero...") - start := time.Now() + // sleep so that a leader is elected by this time + time.Sleep(time.Minute) - ticker := time.NewTicker(time.Minute * 10) - defer ticker.Stop() + glog.Infof("Starting telemetry data collection for zero...") var lastPostedAt time.Time - for range ticker.C { + for ; true; <-time.Tick(time.Hour * 6) { if !s.Node.AmLeader() { continue } - if time.Since(lastPostedAt) < time.Hour { + + if time.Since(lastPostedAt) < time.Hour*24 { continue } + ms := s.membershipState() - t := telemetry.NewZero(ms) - if t == nil { - continue + var numAlphas, numTablets int + for _, g := range ms.GetGroups() { + numAlphas += len(g.GetMembers()) + numTablets += len(g.GetTablets()) } - t.SinceHours = int(time.Since(start).Hours()) - glog.V(2).Infof("Posting Telemetry data: %+v", t) - err := t.Post() - if err == nil { - lastPostedAt = time.Now() - } else { - glog.V(2).Infof("Telemetry couldn't be posted. Error: %v", err) + url := fmt.Sprintf("https://dgraph.gateway.scarf.sh/%v/%v/%v/%v/%v", + x.Version(), runtime.GOOS, numAlphas, len(ms.GetZeros()), numTablets) + glog.Infof("Posting Telemetry data to [%v]", url) + + resp, err := http.Get(url) + if err != nil { + glog.Infof("Telemetry couldn't be posted. Error: %v", err) + continue } + _ = resp.Body.Close() + lastPostedAt = time.Now() } } diff --git a/dgraph/docker-compose.yml b/dgraph/docker-compose.yml index 825b2ad04ce..6e2900264cd 100644 --- a/dgraph/docker-compose.yml +++ b/dgraph/docker-compose.yml @@ -113,9 +113,9 @@ services: cluster: test service: alpha command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption - "key-file=/dgraph-enc/enc-key;" --my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;" + --my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;" @@ -144,9 +144,9 @@ services: cluster: test service: alpha command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption - "key-file=/dgraph-enc/enc-key;" --my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;" + --my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;" @@ -175,9 +175,9 @@ services: cluster: test service: alpha command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption - "key-file=/dgraph-enc/enc-key;" --my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;" + --my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;" @@ -206,9 +206,9 @@ services: cluster: test service: alpha command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption - "key-file=/dgraph-enc/enc-key;" --my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;" + --my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;" @@ -237,9 +237,9 @@ services: cluster: test service: alpha command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption - "key-file=/dgraph-enc/enc-key;" --my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;" + --my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;" diff --git a/edgraph/server.go b/edgraph/server.go index f8c3c2fcd96..8eeb0b28bc1 100644 --- a/edgraph/server.go +++ b/edgraph/server.go @@ -43,7 +43,6 @@ import ( "github.com/hypermodeinc/dgraph/v25/protos/pb" "github.com/hypermodeinc/dgraph/v25/query" "github.com/hypermodeinc/dgraph/v25/schema" - "github.com/hypermodeinc/dgraph/v25/telemetry" "github.com/hypermodeinc/dgraph/v25/tok" "github.com/hypermodeinc/dgraph/v25/types" "github.com/hypermodeinc/dgraph/v25/types/facets" @@ -108,37 +107,6 @@ type existingGQLSchemaQryResp struct { ExistingGQLSchema []graphQLSchemaNode `json:"ExistingGQLSchema"` } -// PeriodicallyPostTelemetry periodically reports telemetry data for alpha. -func PeriodicallyPostTelemetry() { - glog.V(2).Infof("Starting telemetry data collection for alpha...") - - start := time.Now() - ticker := time.NewTicker(time.Minute * 10) - defer ticker.Stop() - - var lastPostedAt time.Time - for range ticker.C { - if time.Since(lastPostedAt) < time.Hour { - continue - } - ms := worker.GetMembershipState() - t := telemetry.NewAlpha(ms) - t.NumDQL = atomic.SwapUint64(&numDQL, 0) - t.NumGraphQL = atomic.SwapUint64(&numGraphQL, 0) - t.SinceHours = int(time.Since(start).Hours()) - glog.V(2).Infof("Posting Telemetry data: %+v", t) - - err := t.Post() - if err == nil { - lastPostedAt = time.Now() - } else { - atomic.AddUint64(&numDQL, t.NumDQL) - atomic.AddUint64(&numGraphQL, t.NumGraphQL) - glog.V(2).Infof("Telemetry couldn't be posted. Error: %v", err) - } - } -} - // GetGQLSchema queries for the GraphQL schema node, and returns the uid and the GraphQL schema. // If multiple schema nodes were found, it returns an error. func GetGQLSchema(namespace uint64) (uid, graphQLSchema string, err error) { diff --git a/graphql/e2e/admin_auth/poorman_auth/docker-compose.yml b/graphql/e2e/admin_auth/poorman_auth/docker-compose.yml index 1a78baf8bb8..45fb50b6471 100644 --- a/graphql/e2e/admin_auth/poorman_auth/docker-compose.yml +++ b/graphql/e2e/admin_auth/poorman_auth/docker-compose.yml @@ -33,7 +33,6 @@ services: cluster: test service: alpha1 command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 - --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --trace - "ratio=1.0;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --expose_trace + --profile_mode block --block_rate 10 --logtostderr -v=2 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --trace "ratio=1.0;" diff --git a/graphql/e2e/admin_auth/poorman_auth_with_acl/docker-compose.yml b/graphql/e2e/admin_auth/poorman_auth_with_acl/docker-compose.yml index e72ccd99e5b..a77877b2747 100644 --- a/graphql/e2e/admin_auth/poorman_auth_with_acl/docker-compose.yml +++ b/graphql/e2e/admin_auth/poorman_auth_with_acl/docker-compose.yml @@ -37,7 +37,7 @@ services: cluster: test service: alpha1 command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 - --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --acl + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --expose_trace + --profile_mode block --block_rate 10 --logtostderr -v=2 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=3s;" --trace "ratio=1.0;" diff --git a/graphql/e2e/auth/debug_off/docker-compose.yml b/graphql/e2e/auth/debug_off/docker-compose.yml index 613abdbb656..53f0069e446 100644 --- a/graphql/e2e/auth/debug_off/docker-compose.yml +++ b/graphql/e2e/auth/debug_off/docker-compose.yml @@ -33,6 +33,6 @@ services: cluster: test service: alpha1 command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --zero=zero1:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=3 --my=alpha1:7080 - --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --trace "ratio=1.0;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --zero=zero1:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=3 --my=alpha1:7080 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --trace "ratio=1.0;" diff --git a/graphql/e2e/auth/docker-compose.yml b/graphql/e2e/auth/docker-compose.yml index 2f7123f62b8..3991bd51107 100644 --- a/graphql/e2e/auth/docker-compose.yml +++ b/graphql/e2e/auth/docker-compose.yml @@ -33,7 +33,7 @@ services: cluster: test service: alpha1 command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --zero=zero1:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=3 --my=alpha1:7080 - --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql "debug=true;" - --trace "ratio=1.0;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --zero=zero1:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=3 --my=alpha1:7080 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql "debug=true;" --trace + "ratio=1.0;" diff --git a/graphql/e2e/auth_closed_by_default/docker-compose.yml b/graphql/e2e/auth_closed_by_default/docker-compose.yml index 2f7123f62b8..3991bd51107 100644 --- a/graphql/e2e/auth_closed_by_default/docker-compose.yml +++ b/graphql/e2e/auth_closed_by_default/docker-compose.yml @@ -33,7 +33,7 @@ services: cluster: test service: alpha1 command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --zero=zero1:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=3 --my=alpha1:7080 - --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql "debug=true;" - --trace "ratio=1.0;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --zero=zero1:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=3 --my=alpha1:7080 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql "debug=true;" --trace + "ratio=1.0;" diff --git a/graphql/e2e/custom_logic/docker-compose.yml b/graphql/e2e/custom_logic/docker-compose.yml index 9f52bcbbf04..93602dbfd02 100644 --- a/graphql/e2e/custom_logic/docker-compose.yml +++ b/graphql/e2e/custom_logic/docker-compose.yml @@ -16,9 +16,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft="idx=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft="idx=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/graphql/e2e/directives/docker-compose.yml b/graphql/e2e/directives/docker-compose.yml index e8762e0259b..d584593d059 100644 --- a/graphql/e2e/directives/docker-compose.yml +++ b/graphql/e2e/directives/docker-compose.yml @@ -33,9 +33,9 @@ services: cluster: test service: alpha1 command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --zero=zero1:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --my=alpha1:7080 - --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --zero=zero1:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --my=alpha1:7080 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql "lambda-url=http://lambda:8686/graphql-worker; debug=true;" --trace "ratio=1.0;" lambda: diff --git a/graphql/e2e/multi_tenancy/docker-compose.yml b/graphql/e2e/multi_tenancy/docker-compose.yml index 2dcffe22c82..bebe56fc5e7 100644 --- a/graphql/e2e/multi_tenancy/docker-compose.yml +++ b/graphql/e2e/multi_tenancy/docker-compose.yml @@ -20,9 +20,8 @@ services: target: /dgraph-acl/hmac-secret read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=3000s;" alpha2: image: dgraph/dgraph:local @@ -44,9 +43,8 @@ services: target: /dgraph-acl/hmac-secret read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=2;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=2;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=3000s;" alpha3: image: dgraph/dgraph:local @@ -68,9 +66,8 @@ services: target: /dgraph-acl/hmac-secret read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=3;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=3;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=3000s;" zero1: image: dgraph/dgraph:local diff --git a/graphql/e2e/normal/docker-compose.yml b/graphql/e2e/normal/docker-compose.yml index e8762e0259b..d584593d059 100644 --- a/graphql/e2e/normal/docker-compose.yml +++ b/graphql/e2e/normal/docker-compose.yml @@ -33,9 +33,9 @@ services: cluster: test service: alpha1 command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --zero=zero1:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --my=alpha1:7080 - --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --zero=zero1:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --my=alpha1:7080 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --graphql "lambda-url=http://lambda:8686/graphql-worker; debug=true;" --trace "ratio=1.0;" lambda: diff --git a/graphql/e2e/schema/docker-compose.yml b/graphql/e2e/schema/docker-compose.yml index 72ce26afba1..047c0a7e84a 100644 --- a/graphql/e2e/schema/docker-compose.yml +++ b/graphql/e2e/schema/docker-compose.yml @@ -20,9 +20,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha2: image: dgraph/dgraph:local working_dir: /data/alpha2 @@ -43,9 +42,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=2;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=2;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha3: image: dgraph/dgraph:local working_dir: /data/alpha3 @@ -66,9 +64,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=3;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=3;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/graphql/e2e/subscription/docker-compose.yml b/graphql/e2e/subscription/docker-compose.yml index 2bfd61d5efb..c8e0d302767 100644 --- a/graphql/e2e/subscription/docker-compose.yml +++ b/graphql/e2e/subscription/docker-compose.yml @@ -16,9 +16,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft="idx=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft="idx=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha2: image: dgraph/dgraph:local working_dir: /data/alpha2 @@ -35,9 +34,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft="idx=2;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft="idx=2;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha3: image: dgraph/dgraph:local working_dir: /data/alpha3 @@ -54,9 +52,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft="idx=3;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft="idx=3;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/graphql/testdata/custom_bench/profiling/docker-compose.yml b/graphql/testdata/custom_bench/profiling/docker-compose.yml index be0f3acf46d..e04ef185ddf 100644 --- a/graphql/testdata/custom_bench/profiling/docker-compose.yml +++ b/graphql/testdata/custom_bench/profiling/docker-compose.yml @@ -25,8 +25,8 @@ services: target: /data/alpha1/p read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" -o 100 --my=alpha1:7180 - --lru_mb=1024 --zero=zero1:5180 --logtostderr -v=2 --raft="idx=1;" --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha -o 100 --my=alpha1:7180 --lru_mb=1024 + --zero=zero1:5180 --logtostderr -v=2 --raft="idx=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local diff --git a/ocagent/docker-compose.yml b/ocagent/docker-compose.yml index e6d6bd8a050..b656b351b00 100644 --- a/ocagent/docker-compose.yml +++ b/ocagent/docker-compose.yml @@ -15,8 +15,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" -o 100 --my=alpha1:7180 - --zero=zero1:5180 --logtostderr -v=2 --trace "jaeger=http://ocagent:14268;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha -o 100 --my=alpha1:7180 --zero=zero1:5180 + --logtostderr -v=2 --trace "jaeger=http://ocagent:14268;" zero1: image: dgraph/dgraph:local container_name: zero1 diff --git a/systest/1million/alpha.yml b/systest/1million/alpha.yml index 911f5dd531c..e4da9e6a311 100644 --- a/systest/1million/alpha.yml +++ b/systest/1million/alpha.yml @@ -18,5 +18,5 @@ services: target: /posting read_only: false command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 --zero=zero1:5080 - -p=/posting --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080 -p=/posting --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" diff --git a/systest/21million/bulk/alpha.yml b/systest/21million/bulk/alpha.yml index 911f5dd531c..e4da9e6a311 100644 --- a/systest/21million/bulk/alpha.yml +++ b/systest/21million/bulk/alpha.yml @@ -18,5 +18,5 @@ services: target: /posting read_only: false command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 --zero=zero1:5080 - -p=/posting --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080 -p=/posting --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" diff --git a/systest/21million/live/docker-compose.yml b/systest/21million/live/docker-compose.yml index 658f4f57c16..122585e267a 100644 --- a/systest/21million/live/docker-compose.yml +++ b/systest/21million/live/docker-compose.yml @@ -16,8 +16,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 --zero=zero1:5080 - --logtostderr -v=2 --security "whitelist=0.0.0.0/0;" + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 --security + "whitelist=0.0.0.0/0;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/systest/acl/restore/docker-compose.yml b/systest/acl/restore/docker-compose.yml index d1f4feed6d6..e292677f024 100644 --- a/systest/acl/restore/docker-compose.yml +++ b/systest/acl/restore/docker-compose.yml @@ -22,9 +22,9 @@ services: target: /secret/hmac read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1; group=1" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1; group=1" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" deploy: resources: limits: diff --git a/systest/audit/docker-compose.yml b/systest/audit/docker-compose.yml index e8f11dacf0c..451b4192c36 100644 --- a/systest/audit/docker-compose.yml +++ b/systest/audit/docker-compose.yml @@ -15,8 +15,8 @@ services: source: ./audit_dir/aa target: /audit_dir command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --raft="idx=1;group=1" - --my=alpha1:7080 --zero=zero1:5080 --logtostderr --audit "output=/audit_dir;" -v=2 --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --raft="idx=1;group=1" --my=alpha1:7080 + --zero=zero1:5080 --logtostderr --audit "output=/audit_dir;" -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local diff --git a/systest/audit_encrypted/docker-compose.yml b/systest/audit_encrypted/docker-compose.yml index f956c71d8aa..36421098ff9 100644 --- a/systest/audit_encrypted/docker-compose.yml +++ b/systest/audit_encrypted/docker-compose.yml @@ -19,10 +19,9 @@ services: target: /dgraph-enc/enc-key read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --raft="idx=1;group=1" - --my=alpha1:7080 --zero=zero1:5080 --logtostderr --audit - "output=/audit_dir;encrypt-file=/dgraph-enc/enc-key" -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --raft="idx=1;group=1" --my=alpha1:7080 + --zero=zero1:5080 --logtostderr --audit "output=/audit_dir;encrypt-file=/dgraph-enc/enc-key" + -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/systest/backup/advanced-scenarios/127-Namespace/docker-compose.yml b/systest/backup/advanced-scenarios/127-Namespace/docker-compose.yml index b1cd96b82c7..281b9279f39 100755 --- a/systest/backup/advanced-scenarios/127-Namespace/docker-compose.yml +++ b/systest/backup/advanced-scenarios/127-Namespace/docker-compose.yml @@ -24,9 +24,9 @@ services: - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1; group=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1; group=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" zero1: image: dgraph/dgraph:local @@ -67,9 +67,9 @@ services: read_only: true - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero2:5080 --logtostderr -v=2 --raft "idx=1; group=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero2:5080 --logtostderr -v=2 + --raft "idx=1; group=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" zero2: image: dgraph/dgraph:local diff --git a/systest/backup/advanced-scenarios/acl-nonAcl/docker-compose.yml b/systest/backup/advanced-scenarios/acl-nonAcl/docker-compose.yml index 684b5bb71e4..ca7f3c850c9 100755 --- a/systest/backup/advanced-scenarios/acl-nonAcl/docker-compose.yml +++ b/systest/backup/advanced-scenarios/acl-nonAcl/docker-compose.yml @@ -25,9 +25,9 @@ services: read_only: true - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1; group=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1; group=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" zero1: image: dgraph/dgraph:local @@ -65,8 +65,8 @@ services: read_only: true - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero2:5080 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero2:5080 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero2: image: dgraph/dgraph:local @@ -109,9 +109,9 @@ services: read_only: true - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero3:5080 --logtostderr -v=2 --raft "idx=1; group=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero3:5080 --logtostderr -v=2 + --raft "idx=1; group=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" zero3: image: dgraph/dgraph:local @@ -149,8 +149,8 @@ services: read_only: true - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha4:7080 - --zero=zero4:5080 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha4:7080 --zero=zero4:5080 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero4: image: dgraph/dgraph:local diff --git a/systest/backup/advanced-scenarios/deleted-namespace/docker-compose.yml b/systest/backup/advanced-scenarios/deleted-namespace/docker-compose.yml index c7d1da6ef74..81233ba678d 100755 --- a/systest/backup/advanced-scenarios/deleted-namespace/docker-compose.yml +++ b/systest/backup/advanced-scenarios/deleted-namespace/docker-compose.yml @@ -23,9 +23,9 @@ services: read_only: true - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1; group=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1; group=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" zero1: image: dgraph/dgraph:local @@ -66,9 +66,9 @@ services: read_only: true - data-volume:/data/backups/ command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero2:5080 --logtostderr -v=2 --raft "idx=1; group=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero2:5080 --logtostderr -v=2 + --raft "idx=1; group=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" zero2: image: dgraph/dgraph:local diff --git a/systest/backup/encryption/docker-compose.yml b/systest/backup/encryption/docker-compose.yml index 00fa413d371..9d1762aa91b 100644 --- a/systest/backup/encryption/docker-compose.yml +++ b/systest/backup/encryption/docker-compose.yml @@ -24,8 +24,8 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --encryption="key-file=/dgraph-enc/enc-key;" --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --encryption="key-file=/dgraph-enc/enc-key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" @@ -53,8 +53,8 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --encryption="key-file=/dgraph-enc/enc-key;" --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --encryption="key-file=/dgraph-enc/enc-key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;" @@ -82,8 +82,8 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --encryption="key-file=/dgraph-enc/enc-key;" --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --encryption="key-file=/dgraph-enc/enc-key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;" diff --git a/systest/backup/filesystem/docker-compose.yml b/systest/backup/filesystem/docker-compose.yml index 6593c3b0556..8fb5c7d3f6e 100644 --- a/systest/backup/filesystem/docker-compose.yml +++ b/systest/backup/filesystem/docker-compose.yml @@ -24,10 +24,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" alpha2: image: dgraph/dgraph:local @@ -51,10 +51,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;" alpha3: image: dgraph/dgraph:local @@ -78,10 +78,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;" zero1: image: dgraph/dgraph:local diff --git a/systest/backup/minio-large/docker-compose.yml b/systest/backup/minio-large/docker-compose.yml index 095ce4dcf2a..271f7abc77b 100644 --- a/systest/backup/minio-large/docker-compose.yml +++ b/systest/backup/minio-large/docker-compose.yml @@ -22,10 +22,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" alpha2: image: dgraph/dgraph:local @@ -47,10 +47,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;" alpha3: image: dgraph/dgraph:local @@ -72,10 +72,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;" minio: image: minio/minio:${MINIO_IMAGE_ARCH:-RELEASE.2020-11-13T20-10-18Z} diff --git a/systest/backup/minio/docker-compose.yml b/systest/backup/minio/docker-compose.yml index ca393de557b..4f77ba763d2 100644 --- a/systest/backup/minio/docker-compose.yml +++ b/systest/backup/minio/docker-compose.yml @@ -22,10 +22,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr --cache "size-mb=500;" -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr + --cache "size-mb=500;" -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" alpha2: image: dgraph/dgraph:local @@ -47,10 +47,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr --cache "size-mb=500;" -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr + --cache "size-mb=500;" -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;" alpha3: image: dgraph/dgraph:local @@ -72,10 +72,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr --cache "size-mb=500;" -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr + --cache "size-mb=500;" -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;" zero1: image: dgraph/dgraph:local diff --git a/systest/backup/multi-tenancy/docker-compose.yml b/systest/backup/multi-tenancy/docker-compose.yml index 6e4d257866e..5788a5811a9 100644 --- a/systest/backup/multi-tenancy/docker-compose.yml +++ b/systest/backup/multi-tenancy/docker-compose.yml @@ -24,9 +24,9 @@ services: target: /data/backups/ read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1; group=1;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1; group=1;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" alpha2: image: dgraph/dgraph:local working_dir: /data/alpha2 @@ -49,9 +49,9 @@ services: target: /data/backups/ read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=2; group=2;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=2; group=2;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" alpha3: image: dgraph/dgraph:local working_dir: /data/alpha3 @@ -74,9 +74,9 @@ services: target: /data/backups/ read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=3; group=3;" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=3; group=3;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + "secret-file=/secret/hmac;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/systest/backup/nfs-backup/docker-compose.yml b/systest/backup/nfs-backup/docker-compose.yml index 4c1291548a9..3f2f7d831ff 100644 --- a/systest/backup/nfs-backup/docker-compose.yml +++ b/systest/backup/nfs-backup/docker-compose.yml @@ -25,7 +25,7 @@ services: - -c - | mount -v -o vers=4,loud nfs:/ /mnt 2>&1 & - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1_backup_clust_ha:7080 --zero=zero1_backup_clust_ha:5080,zero2_backup_clust_ha:5080,zero3_backup_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1_backup_clust_ha:7080 --zero=zero1_backup_clust_ha:5080,zero2_backup_clust_ha:5080,zero3_backup_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha2_backup_clust_ha: image: dgraph-nfs-client:local @@ -45,7 +45,7 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2_backup_clust_ha:7080 --zero=zero1_backup_clust_ha:5080,zero2_backup_clust_ha:5080,zero3_backup_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" @@ -67,7 +67,7 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3_backup_clust_ha:7080 --zero=zero1_backup_clust_ha:5080,zero2_backup_clust_ha:5080,zero3_backup_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" @@ -158,7 +158,7 @@ services: - -c - | mount -v -o vers=4,loud nfs:/ /mnt 2>&1 & - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha4_restore_clust_ha:7080 --zero=zero4_restore_clust_ha:5080,zero5_restore_clust_ha:5080,zero6_restore_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha4_restore_clust_ha:7080 --zero=zero4_restore_clust_ha:5080,zero5_restore_clust_ha:5080,zero6_restore_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha5_restore_clust_ha: image: dgraph-nfs-client:local @@ -178,7 +178,7 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha5_restore_clust_ha:7080 --zero=zero4_restore_clust_ha:5080,zero5_restore_clust_ha:5080,zero6_restore_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" @@ -200,7 +200,7 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha6_restore_clust_ha:7080 --zero=zero4_restore_clust_ha:5080,zero5_restore_clust_ha:5080,zero6_restore_clust_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" @@ -312,7 +312,7 @@ services: - -c - | mount -v -o vers=4,loud nfs:/ /mnt 2>&1 & - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha7_backup_clust_non_ha:7080 --zero=zero7_backup_clust_non_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha7_backup_clust_non_ha:7080 --zero=zero7_backup_clust_non_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" #non HA restore cluster zero8_restore_clust_non_ha: @@ -359,7 +359,7 @@ services: - -c - | mount -v -o vers=4,loud nfs:/ /mnt 2>&1 & - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha8_restore_clust_non_ha:7080 --zero=zero8_restore_clust_non_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha8_restore_clust_non_ha:7080 --zero=zero8_restore_clust_non_ha:5080 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" nfs: image: itsthenetwork/nfs-server-alpine:${NFS_SERVER_IMAGE_ARCH:-12} diff --git a/systest/bgindex/docker-compose.yml b/systest/bgindex/docker-compose.yml index 3149ef655da..4fa545551b6 100644 --- a/systest/bgindex/docker-compose.yml +++ b/systest/bgindex/docker-compose.yml @@ -20,9 +20,8 @@ services: target: /secret/hmac read_only: true command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 --zero=zero1:5080 - --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl - "secret-file=/secret/hmac;" + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/secret/hmac;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/systest/bulk_live/bulk/alpha.yml b/systest/bulk_live/bulk/alpha.yml index bbddd2e14d0..d6da171a02a 100644 --- a/systest/bulk_live/bulk/alpha.yml +++ b/systest/bulk_live/bulk/alpha.yml @@ -18,5 +18,5 @@ services: target: /posting read_only: false command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 --zero=zero1:5080 - --logtostderr -v=2 -p=/posting --security "whitelist=0.0.0.0/0;" + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 -p=/posting + --security "whitelist=0.0.0.0/0;" diff --git a/systest/bulk_live/bulk/alpha_acl.yml b/systest/bulk_live/bulk/alpha_acl.yml index 64ae17f96ae..59c7bbc0e4c 100644 --- a/systest/bulk_live/bulk/alpha_acl.yml +++ b/systest/bulk_live/bulk/alpha_acl.yml @@ -22,6 +22,5 @@ services: target: /dgraph-acl/hmac-secret read_only: true command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 --zero=zero1:5080 - --logtostderr -v=2 -p=/posting --security "whitelist=0.0.0.0/0;" --acl - "secret-file=/dgraph-acl/hmac-secret; " + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 -p=/posting + --security "whitelist=0.0.0.0/0;" --acl "secret-file=/dgraph-acl/hmac-secret; " diff --git a/systest/bulk_live/live/docker-compose.yml b/systest/bulk_live/live/docker-compose.yml index 49d1074a8e9..99b15d88220 100644 --- a/systest/bulk_live/live/docker-compose.yml +++ b/systest/bulk_live/live/docker-compose.yml @@ -16,9 +16,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 --zero=zero1:5080 - --logtostderr -v=2 --raft='idx=1; group=1;' --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 --raft='idx=1; + group=1;' --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" deploy: resources: limits: diff --git a/systest/cdc/docker-compose.yml b/systest/cdc/docker-compose.yml index 06d06c67ec8..39142f20e89 100644 --- a/systest/cdc/docker-compose.yml +++ b/systest/cdc/docker-compose.yml @@ -17,9 +17,8 @@ services: source: ./cdc_logs target: /cdc command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr --cdc "file=/cdc;" -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr --cdc + "file=/cdc;" -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/systest/cloud/docker-compose.yml b/systest/cloud/docker-compose.yml index 04911fbdd21..30aff0934d7 100644 --- a/systest/cloud/docker-compose.yml +++ b/systest/cloud/docker-compose.yml @@ -39,9 +39,9 @@ services: cluster: test service: alpha command: - /gobin/dgraph alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10 - --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl + /gobin/dgraph alpha --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace + --profile_mode block --block_rate 10 --logtostderr -v=2 --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;" --limit "shared-instance=true" minio: diff --git a/systest/export/docker-compose.yml b/systest/export/docker-compose.yml index 68a0d63165c..4b90d63a26b 100644 --- a/systest/export/docker-compose.yml +++ b/systest/export/docker-compose.yml @@ -22,9 +22,8 @@ services: target: /data read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha2: image: dgraph/dgraph:local working_dir: /data/alpha2 @@ -45,9 +44,8 @@ services: target: /data read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha3: image: dgraph/dgraph:local working_dir: /data/alpha3 @@ -68,9 +66,8 @@ services: target: /data read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" minio: image: minio/minio:${MINIO_IMAGE_ARCH:-RELEASE.2020-11-13T20-10-18Z} env_file: diff --git a/systest/group-delete/docker-compose.yml b/systest/group-delete/docker-compose.yml index b453ef4e872..a88194a5c40 100644 --- a/systest/group-delete/docker-compose.yml +++ b/systest/group-delete/docker-compose.yml @@ -16,9 +16,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "group=1" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "group=1" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha2: image: dgraph/dgraph:local working_dir: /data/alpha2 @@ -33,9 +32,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "group=2" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "group=2" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha3: image: dgraph/dgraph:local working_dir: /data/alpha3 @@ -50,9 +48,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "group=3" --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "group=3" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/systest/ldbc/alpha.yml b/systest/ldbc/alpha.yml index a4fb2d55de2..edddb2a42e8 100644 --- a/systest/ldbc/alpha.yml +++ b/systest/ldbc/alpha.yml @@ -18,6 +18,5 @@ services: target: /posting read_only: false command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 -p=/posting --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 -p=/posting + --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" diff --git a/systest/loader/docker-compose.yml b/systest/loader/docker-compose.yml index ae35147bde2..ebc589c82a3 100644 --- a/systest/loader/docker-compose.yml +++ b/systest/loader/docker-compose.yml @@ -20,10 +20,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" zero1: image: dgraph/dgraph:local diff --git a/systest/multi-tenancy/docker-compose.yml b/systest/multi-tenancy/docker-compose.yml index 4cc5b5f6487..e82526ab2b7 100644 --- a/systest/multi-tenancy/docker-compose.yml +++ b/systest/multi-tenancy/docker-compose.yml @@ -41,8 +41,8 @@ services: cluster: test service: alpha command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption - "key-file=/dgraph-enc/enc-key;" --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;" + --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block + --block_rate 10 --logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;" diff --git a/systest/online-restore/docker-compose.yml b/systest/online-restore/docker-compose.yml index 739bd586936..4fd53cad176 100644 --- a/systest/online-restore/docker-compose.yml +++ b/systest/online-restore/docker-compose.yml @@ -30,11 +30,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=1;" --encryption - "key-file=/data/keys/enc_key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" - --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; - server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=1;" --encryption "key-file=/data/keys/enc_key;" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; + server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" alpha2: image: dgraph/dgraph:local @@ -68,11 +67,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=2;" --encryption - "key-file=/data/keys/enc_key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" - --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; - server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=2;" --encryption "key-file=/data/keys/enc_key;" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; + server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;" alpha3: image: dgraph/dgraph:local @@ -106,11 +104,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=3;" --encryption - "key-file=/data/keys/enc_key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" - --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; - server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=3;" --encryption "key-file=/data/keys/enc_key;" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; + server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;" alpha4: image: dgraph/dgraph:local @@ -144,11 +141,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha4:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=4;" --encryption - "key-file=/data/keys/enc_key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" - --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; - server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha4:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=4;" --encryption "key-file=/data/keys/enc_key;" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; + server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha4.crt; client-key=/dgraph-tls/client.alpha4.key;" alpha5: image: dgraph/dgraph:local @@ -182,11 +178,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha5:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=5;" --encryption - "key-file=/data/keys/enc_key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" - --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; - server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha5:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=5;" --encryption "key-file=/data/keys/enc_key;" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; + server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha5.crt; client-key=/dgraph-tls/client.alpha5.key;" alpha6: image: dgraph/dgraph:local @@ -220,11 +215,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha6:7080 - --zero=zero1:5080 --logtostderr -v=2 --raft "idx=6;" --encryption - "key-file=/data/keys/enc_key;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" - --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; - server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha6:7080 --zero=zero1:5080 --logtostderr -v=2 + --raft "idx=6;" --encryption "key-file=/data/keys/enc_key;" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; + server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha6.crt; client-key=/dgraph-tls/client.alpha6.key;" zero1: image: dgraph/dgraph:local diff --git a/systest/plugin/docker-compose.yml b/systest/plugin/docker-compose.yml index 7ba3542014a..862e03e2d7f 100644 --- a/systest/plugin/docker-compose.yml +++ b/systest/plugin/docker-compose.yml @@ -20,8 +20,7 @@ services: target: /plugins read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr --custom_tokenizers=/plugins/0.so,/plugins/1.so,/plugins/2.so,/plugins/3.so -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: diff --git a/telemetry/telemetry.go b/telemetry/telemetry.go deleted file mode 100644 index c5a7e9af497..00000000000 --- a/telemetry/telemetry.go +++ /dev/null @@ -1,127 +0,0 @@ -/* - * SPDX-FileCopyrightText: © Hypermode Inc. - * SPDX-License-Identifier: Apache-2.0 - */ - -package telemetry - -import ( - "bytes" - "encoding/json" - "io" - "net/http" - "runtime" - "time" - - "github.com/golang/glog" - "github.com/pkg/errors" - - "github.com/hypermodeinc/dgraph/v25/protos/pb" - "github.com/hypermodeinc/dgraph/v25/worker" - "github.com/hypermodeinc/dgraph/v25/x" -) - -// Telemetry holds information about the state of the zero and alpha server. -type Telemetry struct { - Arch string `json:",omitempty"` - Cid string `json:",omitempty"` - ClusterSize int `json:",omitempty"` - DiskUsageMB int64 `json:",omitempty"` - NumAlphas int `json:",omitempty"` - NumGroups int `json:",omitempty"` - NumTablets int `json:",omitempty"` - NumZeros int `json:",omitempty"` - OS string `json:",omitempty"` - SinceHours int `json:",omitempty"` - Version string `json:",omitempty"` - NumDQL uint64 `json:",omitempty"` - NumGraphQL uint64 `json:",omitempty"` - EEFeaturesList []string `json:",omitempty"` - Codename string `json:",omitempty"` -} - -const url = "https://ping.dgraph.io/3.0/projects/5b809dfac9e77c0001783ad0/events" - -// NewZero returns a Telemetry struct that holds information about the state of zero server. -func NewZero(ms *pb.MembershipState) *Telemetry { - if len(ms.GetCid()) == 0 { - glog.V(2).Infoln("No CID found yet") - return nil - } - t := &Telemetry{ - Cid: ms.GetCid(), - NumGroups: len(ms.GetGroups()), - NumZeros: len(ms.GetZeros()), - Version: x.Version(), - OS: runtime.GOOS, - Arch: runtime.GOARCH, - Codename: x.Codename(), - } - for _, g := range ms.GetGroups() { - t.NumAlphas += len(g.GetMembers()) - for _, tablet := range g.GetTablets() { - t.NumTablets++ - t.DiskUsageMB += tablet.GetOnDiskBytes() - } - } - t.DiskUsageMB /= (1 << 20) - t.ClusterSize = t.NumAlphas + t.NumZeros - return t -} - -// NewAlpha returns a Telemetry struct that holds information about the state of alpha server. -func NewAlpha(ms *pb.MembershipState) *Telemetry { - return &Telemetry{ - Cid: ms.GetCid(), - Version: x.Version(), - OS: runtime.GOOS, - Arch: runtime.GOARCH, - EEFeaturesList: worker.GetFeaturesList(), - Codename: x.Codename(), - } -} - -// Post reports the Telemetry to the stats server. -func (t *Telemetry) Post() error { - data, err := json.Marshal(t) - if err != nil { - return err - } - - var requestURL string - if t.Version != "dev" { - requestURL = url + "/pings" - } else { - requestURL = url + "/dev" - } - req, err := http.NewRequest("POST", requestURL, bytes.NewBuffer(data)) - if err != nil { - return err - } - req.Header.Set("Content-Type", "application/json") - req.Header.Set("Authorization", "D0398E8C83BB30F67C519FDA6175975F680921890C35B36C34BE1095445"+ - "97497CA758881BD7D56CC2355A2F36B4560102CBC3279AC7B27E5391372C36A31167EB0D06BF3764894AD20"+ - "A0554BAFF14C292A40BC252BB9FF008736A0FD1D44E085") - - client := &http.Client{Timeout: 10 * time.Second} - resp, err := client.Do(req) - if err != nil { - return err - } - - defer func() { - if err := resp.Body.Close(); err != nil { - glog.Warningf("error closing body: %v", err) - } - }() - body, err := io.ReadAll(resp.Body) - if err != nil { - return err - } - if resp.StatusCode != 201 { - return errors.Errorf(string(body)) - } - glog.V(2).Infof("Telemetry response status: %v", resp.Status) - glog.V(2).Infof("Telemetry response body: %s", body) - return nil -} diff --git a/testutil/testaudit/docker-compose.yml b/testutil/testaudit/docker-compose.yml index f956c71d8aa..36421098ff9 100644 --- a/testutil/testaudit/docker-compose.yml +++ b/testutil/testaudit/docker-compose.yml @@ -19,10 +19,9 @@ services: target: /dgraph-enc/enc-key read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --raft="idx=1;group=1" - --my=alpha1:7080 --zero=zero1:5080 --logtostderr --audit - "output=/audit_dir;encrypt-file=/dgraph-enc/enc-key" -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --raft="idx=1;group=1" --my=alpha1:7080 + --zero=zero1:5080 --logtostderr --audit "output=/audit_dir;encrypt-file=/dgraph-enc/enc-key" + -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/tlstest/acl/docker-compose.yml b/tlstest/acl/docker-compose.yml index 81eec5eda01..0fccfe6111d 100644 --- a/tlstest/acl/docker-compose.yml +++ b/tlstest/acl/docker-compose.yml @@ -22,8 +22,8 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --acl "secret-file=/dgraph-acl/hmac-secret;" --security + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --acl "secret-file=/dgraph-acl/hmac-secret;" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key; diff --git a/tlstest/certrequest/docker-compose.yml b/tlstest/certrequest/docker-compose.yml index 341b2efa5c4..3f52c4a72ed 100644 --- a/tlstest/certrequest/docker-compose.yml +++ b/tlstest/certrequest/docker-compose.yml @@ -20,10 +20,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - client-auth-type=REQUEST; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; client-auth-type=REQUEST; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/tlstest/certrequireandverify/docker-compose.yml b/tlstest/certrequireandverify/docker-compose.yml index 0067304a4e7..a208cac55e4 100644 --- a/tlstest/certrequireandverify/docker-compose.yml +++ b/tlstest/certrequireandverify/docker-compose.yml @@ -20,11 +20,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - client-auth-type=REQUIREANDVERIFY; server-cert=/dgraph-tls/node.crt; - server-key=/dgraph-tls/node.key;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; client-auth-type=REQUIREANDVERIFY; + server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/tlstest/certverifyifgiven/docker-compose.yml b/tlstest/certverifyifgiven/docker-compose.yml index 869ebc37ae3..e71426b5aaf 100644 --- a/tlstest/certverifyifgiven/docker-compose.yml +++ b/tlstest/certverifyifgiven/docker-compose.yml @@ -20,10 +20,9 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - client-auth-type=VERIFYIFGIVEN; server-cert=/dgraph-tls/node.crt; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; client-auth-type=VERIFYIFGIVEN; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key;" zero1: image: dgraph/dgraph:local diff --git a/tlstest/mtls_internal/ha_6_node/docker-compose.yml b/tlstest/mtls_internal/ha_6_node/docker-compose.yml index be821ee5f9d..90ea1b9cc9d 100644 --- a/tlstest/mtls_internal/ha_6_node/docker-compose.yml +++ b/tlstest/mtls_internal/ha_6_node/docker-compose.yml @@ -18,10 +18,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" alpha2: image: dgraph/dgraph:local @@ -41,10 +41,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;" alpha3: image: dgraph/dgraph:local @@ -64,10 +64,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;" zero1: image: dgraph/dgraph:local diff --git a/tlstest/mtls_internal/multi_group/docker-compose.yml b/tlstest/mtls_internal/multi_group/docker-compose.yml index 77f50e76b34..c83a7a83417 100644 --- a/tlstest/mtls_internal/multi_group/docker-compose.yml +++ b/tlstest/mtls_internal/multi_group/docker-compose.yml @@ -18,10 +18,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" alpha2: image: dgraph/dgraph:local @@ -41,10 +41,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;" alpha3: image: dgraph/dgraph:local @@ -64,10 +64,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;" zero1: image: dgraph/dgraph:local diff --git a/tlstest/mtls_internal/single_node/docker-compose.yml b/tlstest/mtls_internal/single_node/docker-compose.yml index 5e278b79b76..0cb1785f3ee 100644 --- a/tlstest/mtls_internal/single_node/docker-compose.yml +++ b/tlstest/mtls_internal/single_node/docker-compose.yml @@ -18,10 +18,10 @@ services: target: /dgraph-tls read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls "ca-cert=/dgraph-tls/ca.crt; - server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --tls + "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; + server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;" zero1: image: dgraph/dgraph:local diff --git a/tlstest/zero_https/all_routes_tls/docker-compose.yml b/tlstest/zero_https/all_routes_tls/docker-compose.yml index 98d4035d8ae..fd0fad130de 100644 --- a/tlstest/zero_https/all_routes_tls/docker-compose.yml +++ b/tlstest/zero_https/all_routes_tls/docker-compose.yml @@ -16,9 +16,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/tlstest/zero_https/no_tls/docker-compose.yml b/tlstest/zero_https/no_tls/docker-compose.yml index b0fda5c3110..da37b63ba47 100644 --- a/tlstest/zero_https/no_tls/docker-compose.yml +++ b/tlstest/zero_https/no_tls/docker-compose.yml @@ -16,9 +16,8 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080 - --zero=zero1:5080 --logtostderr -v=2 --security - "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2 + --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" zero1: image: dgraph/dgraph:local working_dir: /data/zero1 diff --git a/worker/docker-compose.yml b/worker/docker-compose.yml index 21e1d6f801b..82949f39b65 100644 --- a/worker/docker-compose.yml +++ b/worker/docker-compose.yml @@ -16,10 +16,10 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --trace - "jaeger=http://jaeger:14268;" --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --logtostderr -v=2 --raft "idx=1; group=1; snapshot-after-entries=100; - snapshot-after-duration=1m" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --trace "jaeger=http://jaeger:14268;" --my=alpha1:7080 + --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --raft "idx=1; group=1; + snapshot-after-entries=100; snapshot-after-duration=1m" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha2: image: dgraph/dgraph:local working_dir: /data/alpha2 @@ -34,10 +34,10 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --trace - "jaeger=http://jaeger:14268;" --my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --logtostderr -v=2 --raft "idx=2; group=1; snapshot-after-entries=100; - snapshot-after-duration=1m" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --trace "jaeger=http://jaeger:14268;" --my=alpha2:7080 + --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --raft "idx=2; group=1; + snapshot-after-entries=100; snapshot-after-duration=1m" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha3: image: dgraph/dgraph:local working_dir: /data/alpha3 @@ -52,10 +52,10 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --trace - "jaeger=http://jaeger:14268;" --my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --logtostderr -v=2 --raft "idx=3; group=1; snapshot-after-entries=100; - snapshot-after-duration=1m" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --trace "jaeger=http://jaeger:14268;" --my=alpha3:7080 + --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --raft "idx=3; group=1; + snapshot-after-entries=100; snapshot-after-duration=1m" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha4: image: dgraph/dgraph:local working_dir: /data/alpha4 @@ -70,10 +70,10 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --trace - "jaeger=http://jaeger:14268;" --my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --logtostderr -v=2 --raft "idx=4; group=2; snapshot-after-entries=100; - snapshot-after-duration=1m" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --trace "jaeger=http://jaeger:14268;" --my=alpha4:7080 + --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --raft "idx=4; group=2; + snapshot-after-entries=100; snapshot-after-duration=1m" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha5: image: dgraph/dgraph:local working_dir: /data/alpha5 @@ -88,10 +88,10 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --trace - "jaeger=http://jaeger:14268;" --my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --logtostderr -v=2 --raft "idx=5; group=2; snapshot-after-entries=100; - snapshot-after-duration=1m" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --trace "jaeger=http://jaeger:14268;" --my=alpha5:7080 + --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --raft "idx=5; group=2; + snapshot-after-entries=100; snapshot-after-duration=1m" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" alpha6: image: dgraph/dgraph:local working_dir: /data/alpha6 @@ -106,10 +106,10 @@ services: target: /gobin read_only: true command: - /gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --trace - "jaeger=http://jaeger:14268;" --my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080 - --logtostderr -v=2 --raft "idx=6; group=2; snapshot-after-entries=100; - snapshot-after-duration=1m" --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" + /gobin/dgraph ${COVERAGE_OUTPUT} alpha --trace "jaeger=http://jaeger:14268;" --my=alpha6:7080 + --zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --raft "idx=6; group=2; + snapshot-after-entries=100; snapshot-after-duration=1m" --security + "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" jaeger: image: jaegertracing/all-in-one:1.60 working_dir: /working/jaeger