Skip to content

Commit da177cd

Browse files
mangalaman93mangalaman93
committed
stop sending telemetry to ping.dgraph.io and define root namespace
1 parent 1f0621e commit da177cd

67 files changed

Lines changed: 461 additions & 725 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dgraph/cmd/alpha/mutations_mode/docker-compose.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
target: /gobin
1818
read_only: true
1919
command:
20-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080
20+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080
2121
--zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
2222
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=disallow;"
2323
alpha2:
@@ -34,7 +34,7 @@ services:
3434
target: /gobin
3535
read_only: true
3636
command:
37-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha2:7080
37+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080
3838
--zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
3939
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=strict;"
4040
alpha3:
@@ -51,7 +51,7 @@ services:
5151
target: /gobin
5252
read_only: true
5353
command:
54-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha3:7080
54+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080
5555
--zero=zero1:5080,zero2:5080,zero3:5080 --logtostderr -v=2 --security
5656
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --limit "mutations=strict;"
5757
zero1:
@@ -68,8 +68,8 @@ services:
6868
target: /gobin
6969
read_only: true
7070
command:
71-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --raft "idx=1;"
72-
--my=zero1:5080 --replicas=1 --logtostderr -v=2 --bindall
71+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --raft "idx=1;" --my=zero1:5080 --replicas=1
72+
--logtostderr -v=2 --bindall
7373
zero2:
7474
image: dgraph/dgraph:local
7575
working_dir: /data/zero2
@@ -86,8 +86,8 @@ services:
8686
target: /gobin
8787
read_only: true
8888
command:
89-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --raft "idx=2;"
90-
--my=zero2:5080 --replicas=1 --logtostderr -v=2 --peer=zero1:5080
89+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --raft "idx=2;" --my=zero2:5080 --replicas=1
90+
--logtostderr -v=2 --peer=zero1:5080
9191
zero3:
9292
image: dgraph/dgraph:local
9393
working_dir: /data/zero3
@@ -104,6 +104,6 @@ services:
104104
target: /gobin
105105
read_only: true
106106
command:
107-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --raft "idx=3;"
108-
--my=zero3:5080 --replicas=1 --logtostderr -v=2 --peer=zero1:5080
107+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --raft "idx=3;" --my=zero3:5080 --replicas=1
108+
--logtostderr -v=2 --peer=zero1:5080
109109
volumes: {}

‎dgraph/cmd/alpha/run.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -612,9 +612,8 @@ func setupServer(closer *z.Closer) {
612612
}
613613

614614
func run() {
615-
var err error
616-
617-
telemetry := z.NewSuperFlag(Alpha.Conf.GetString("telemetry")).
615+
// keeping this flag for backward compatibility
616+
_ = z.NewSuperFlag(Alpha.Conf.GetString("telemetry")).
618617
MergeAndCheckDefault(x.TelemetryDefaults)
619618

620619
bindall = Alpha.Conf.GetBool("bindall")
@@ -712,10 +711,6 @@ func run() {
712711
}
713712
x.WorkerConfig.Parse(Alpha.Conf)
714713

715-
if telemetry.GetBool("reports") {
716-
go edgraph.PeriodicallyPostTelemetry()
717-
}
718-
719714
// Set the directory for temporary buffers.
720715
z.SetTmpDir(x.WorkerConfig.TmpDir)
721716

‎dgraph/cmd/zero/run.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636

3737
type options struct {
3838
raft *z.SuperFlag
39-
telemetry *z.SuperFlag
4039
limit *z.SuperFlag
4140
bindall bool
4241
portOffset int
@@ -200,7 +199,7 @@ func (st *state) serveGRPC(l net.Listener, store *raftwal.DiskStorage) {
200199

201200
func run() {
202201
// keeping this flag for backward compatibility
203-
telemetry := z.NewSuperFlag(Zero.Conf.GetString("telemetry")).
202+
_ = z.NewSuperFlag(Zero.Conf.GetString("telemetry")).
204203
MergeAndCheckDefault(x.TelemetryDefaults)
205204

206205
x.PrintVersion()
@@ -217,7 +216,6 @@ func run() {
217216
RefillAfter: limit.GetDuration("refill-interval"),
218217
}
219218
opts = options{
220-
telemetry: telemetry,
221219
raft: raft,
222220
limit: limit,
223221
bindall: Zero.Conf.GetBool("bindall"),
@@ -307,10 +305,6 @@ func run() {
307305
// This must be here. It does not work if placed before Grpc init.
308306
x.Check(st.node.initAndStartNode())
309307

310-
if opts.telemetry.GetBool("reports") {
311-
go st.zero.periodicallyPostTelemetry()
312-
}
313-
314308
sdCh := make(chan os.Signal, 1)
315309
signal.Notify(sdCh, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
316310

‎dgraph/cmd/zero/zero.go‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/dgraph-io/ristretto/v2/z"
2424
"github.com/hypermodeinc/dgraph/v24/conn"
2525
"github.com/hypermodeinc/dgraph/v24/protos/pb"
26-
"github.com/hypermodeinc/dgraph/v24/telemetry"
2726
"github.com/hypermodeinc/dgraph/v24/x"
2827
)
2928

@@ -97,38 +96,6 @@ func (s *Server) Init() {
9796
go s.rebalanceTablets()
9897
}
9998

100-
func (s *Server) periodicallyPostTelemetry() {
101-
glog.V(2).Infof("Starting telemetry data collection for zero...")
102-
start := time.Now()
103-
104-
ticker := time.NewTicker(time.Minute * 10)
105-
defer ticker.Stop()
106-
107-
var lastPostedAt time.Time
108-
for range ticker.C {
109-
if !s.Node.AmLeader() {
110-
continue
111-
}
112-
if time.Since(lastPostedAt) < time.Hour {
113-
continue
114-
}
115-
ms := s.membershipState()
116-
t := telemetry.NewZero(ms)
117-
if t == nil {
118-
continue
119-
}
120-
t.SinceHours = int(time.Since(start).Hours())
121-
glog.V(2).Infof("Posting Telemetry data: %+v", t)
122-
123-
err := t.Post()
124-
if err == nil {
125-
lastPostedAt = time.Now()
126-
} else {
127-
glog.V(2).Infof("Telemetry couldn't be posted. Error: %v", err)
128-
}
129-
}
130-
}
131-
13299
func (s *Server) triggerLeaderChange() {
133100
s.Lock()
134101
defer s.Unlock()

‎dgraph/docker-compose.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ services:
3636
target: /gobin
3737
read_only: true
3838
command:
39-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --my=zero2:5080
40-
--replicas 3 --raft="idx=2" --logtostderr -v=2 --peer=zero1:5080
39+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --my=zero2:5080 --replicas 3 --raft="idx=2"
40+
--logtostderr -v=2 --peer=zero1:5080
4141

4242
zero3:
4343
image: dgraph/dgraph:local
@@ -56,8 +56,8 @@ services:
5656
target: /gobin
5757
read_only: true
5858
command:
59-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --my=zero3:5080 --replicas
60-
3 --raft="idx=3" --logtostderr -v=2 --peer=zero1:5080
59+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --my=zero3:5080 --replicas 3 --raft="idx=3"
60+
--logtostderr -v=2 --peer=zero1:5080
6161

6262
alpha1:
6363
image: dgraph/dgraph:local
@@ -82,10 +82,10 @@ services:
8282
cluster: test
8383
service: alpha
8484
command:
85-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
86-
"key-file=/dgraph-enc/enc-key;" --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080
87-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
88-
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
85+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false; sentry=false;"
86+
sentry=false;" --encryption "key-file=/dgraph-enc/enc-key;" --my=alpha1:7080
87+
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
88+
--logtostderr -v=2 --security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
8989
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
9090

9191
alpha2:
@@ -113,9 +113,9 @@ services:
113113
cluster: test
114114
service: alpha
115115
command:
116-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
117-
"key-file=/dgraph-enc/enc-key;" --my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080
118-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
116+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
117+
--my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
118+
--block_rate 10 --logtostderr -v=2 --security
119119
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
120120
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
121121

@@ -144,9 +144,9 @@ services:
144144
cluster: test
145145
service: alpha
146146
command:
147-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
148-
"key-file=/dgraph-enc/enc-key;" --my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080
149-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
147+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
148+
--my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
149+
--block_rate 10 --logtostderr -v=2 --security
150150
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
151151
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
152152

@@ -175,9 +175,9 @@ services:
175175
cluster: test
176176
service: alpha
177177
command:
178-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
179-
"key-file=/dgraph-enc/enc-key;" --my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080
180-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
178+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
179+
--my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
180+
--block_rate 10 --logtostderr -v=2 --security
181181
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
182182
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
183183

@@ -206,9 +206,9 @@ services:
206206
cluster: test
207207
service: alpha
208208
command:
209-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
210-
"key-file=/dgraph-enc/enc-key;" --my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080
211-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
209+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
210+
--my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
211+
--block_rate 10 --logtostderr -v=2 --security
212212
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
213213
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
214214

@@ -237,9 +237,9 @@ services:
237237
cluster: test
238238
service: alpha
239239
command:
240-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
241-
"key-file=/dgraph-enc/enc-key;" --my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080
242-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
240+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
241+
--my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
242+
--block_rate 10 --logtostderr -v=2 --security
243243
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;" --acl
244244
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
245245

‎dgraphtest/dgraph.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ func (z *zero) cmd(c *LocalCluster) []string {
129129
fmt.Sprintf(`--replicas=%v`, c.conf.replicas), "--logtostderr", fmt.Sprintf("-v=%d", c.conf.verbosity)}
130130

131131
if c.lowerThanV21 {
132-
zcmd = append(zcmd, fmt.Sprintf(`--idx=%v`, z.id+1), "--telemetry=false")
132+
zcmd = append(zcmd, fmt.Sprintf(`--idx=%v`, z.id+1))
133133
} else {
134-
zcmd = append(zcmd, fmt.Sprintf(`--raft=idx=%v`, z.id+1), "--telemetry=reports=false;",
134+
zcmd = append(zcmd, fmt.Sprintf(`--raft=idx=%v`, z.id+1),
135135
fmt.Sprintf(`--limit=refill-interval=%v;uid-lease=%v`, c.conf.refillInterval, c.conf.uidLease))
136136
}
137137

@@ -233,10 +233,9 @@ func (a *alpha) cmd(c *LocalCluster) []string {
233233
"--bindall", "--logtostderr", fmt.Sprintf("-v=%d", c.conf.verbosity)}
234234

235235
if c.lowerThanV21 {
236-
acmd = append(acmd, `--whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`, "--telemetry=false")
236+
acmd = append(acmd, `--whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`)
237237
} else {
238-
acmd = append(acmd, `--security=whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`,
239-
"--telemetry=reports=false;")
238+
acmd = append(acmd, `--security=whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`)
240239
}
241240

242241
if c.conf.lambdaURL != "" {

‎edgraph/namespace.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,16 @@ func isValidNamespaceToDelete(name string) error {
285285
if name == "" {
286286
return errors.Errorf("namespace name cannot be empty")
287287
}
288-
if name == "root" || name == "galaxy" || name == "dgraph-0" {
288+
if isSystemNamespace(name) {
289289
return fmt.Errorf("namespace [%v] cannot be renamed/dropped", name)
290290
}
291291
return nil
292292
}
293293

294294
func getNamespaceIDFromName(ctx context.Context, nsName string) (uint64, error) {
295+
if isSystemNamespace(nsName) {
296+
return 0, nil
297+
}
295298
if isLgacyNamespace(nsName) {
296299
return extractNsIDFromLegacyNamespace(nsName)
297300
}

‎edgraph/server.go‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import (
4343
"github.com/hypermodeinc/dgraph/v24/protos/pb"
4444
"github.com/hypermodeinc/dgraph/v24/query"
4545
"github.com/hypermodeinc/dgraph/v24/schema"
46-
"github.com/hypermodeinc/dgraph/v24/telemetry"
4746
"github.com/hypermodeinc/dgraph/v24/tok"
4847
"github.com/hypermodeinc/dgraph/v24/types"
4948
"github.com/hypermodeinc/dgraph/v24/types/facets"
@@ -108,37 +107,6 @@ type existingGQLSchemaQryResp struct {
108107
ExistingGQLSchema []graphQLSchemaNode `json:"ExistingGQLSchema"`
109108
}
110109

111-
// PeriodicallyPostTelemetry periodically reports telemetry data for alpha.
112-
func PeriodicallyPostTelemetry() {
113-
glog.V(2).Infof("Starting telemetry data collection for alpha...")
114-
115-
start := time.Now()
116-
ticker := time.NewTicker(time.Minute * 10)
117-
defer ticker.Stop()
118-
119-
var lastPostedAt time.Time
120-
for range ticker.C {
121-
if time.Since(lastPostedAt) < time.Hour {
122-
continue
123-
}
124-
ms := worker.GetMembershipState()
125-
t := telemetry.NewAlpha(ms)
126-
t.NumDQL = atomic.SwapUint64(&numDQL, 0)
127-
t.NumGraphQL = atomic.SwapUint64(&numGraphQL, 0)
128-
t.SinceHours = int(time.Since(start).Hours())
129-
glog.V(2).Infof("Posting Telemetry data: %+v", t)
130-
131-
err := t.Post()
132-
if err == nil {
133-
lastPostedAt = time.Now()
134-
} else {
135-
atomic.AddUint64(&numDQL, t.NumDQL)
136-
atomic.AddUint64(&numGraphQL, t.NumGraphQL)
137-
glog.V(2).Infof("Telemetry couldn't be posted. Error: %v", err)
138-
}
139-
}
140-
}
141-
142110
// GetGQLSchema queries for the GraphQL schema node, and returns the uid and the GraphQL schema.
143111
// If multiple schema nodes were found, it returns an error.
144112
func GetGQLSchema(namespace uint64) (uid, graphQLSchema string, err error) {

‎graphql/e2e/admin_auth/poorman_auth/docker-compose.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ services:
1515
target: /gobin
1616
read_only: true
1717
command:
18-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --my=zero1:5080
19-
--logtostderr -v=2 --bindall --expose_trace --profile_mode block --block_rate 10
18+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --my=zero1:5080 --logtostderr -v=2 --bindall
19+
--expose_trace --profile_mode block --block_rate 10
2020

2121
alpha1:
2222
image: dgraph/dgraph:local
@@ -33,7 +33,6 @@ services:
3333
cluster: test
3434
service: alpha1
3535
command:
36-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080
37-
--zero=zero1:5080 --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2
38-
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --trace
39-
"ratio=1.0;"
36+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --expose_trace
37+
--profile_mode block --block_rate 10 --logtostderr -v=2 --security
38+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --trace "ratio=1.0;"

‎graphql/e2e/admin_auth/poorman_auth_with_acl/docker-compose.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ services:
1515
target: /gobin
1616
read_only: true
1717
command:
18-
/gobin/dgraph ${COVERAGE_OUTPUT} zero --telemetry "reports=false;" --my=zero1:5080
19-
--logtostderr -v=2 --bindall --expose_trace --profile_mode block --block_rate 10
18+
/gobin/dgraph ${COVERAGE_OUTPUT} zero --my=zero1:5080 --logtostderr -v=2 --bindall
19+
--expose_trace --profile_mode block --block_rate 10
2020

2121
alpha1:
2222
image: dgraph/dgraph:local
@@ -37,7 +37,7 @@ services:
3737
cluster: test
3838
service: alpha1
3939
command:
40-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --my=alpha1:7080
41-
--zero=zero1:5080 --expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2
42-
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --acl
40+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --expose_trace
41+
--profile_mode block --block_rate 10 --logtostderr -v=2 --security
42+
"whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16; token=itIsSecret;" --acl
4343
"secret-file=/dgraph-acl/hmac-secret; access-ttl=3s;" --trace "ratio=1.0;"

0 commit comments

Comments
 (0)