Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

/health endpoint now shows EE Features available #5293

Merged
merged 9 commits into from
Apr 27, 2020
Merged

Conversation

parasssh
Copy link
Contributor

@parasssh parasssh commented Apr 24, 2020

Fixes #5234
Fixes DGRAPH-1268

The /health alpha endpoint now includes the EE Features that are enabled. For OSS builds this field will be absent since no EE Features are available.

As of now, the following EE Features are identified:

  1. Backup and Restore
  2. ACL
  3. Encryption at Rest
  4. Encrypted Exports
  5. Encrypted backup and restore.

This change is Reviewable

@parasssh parasssh requested review from manishrjain and a team as code owners April 24, 2020 22:32
Copy link
Contributor

@manishrjain manishrjain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 5 of 5 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @parasssh)


ee/utils_ee.go, line 41 at r1 (raw file):

	var ee []string
	if len(worker.Config.HmacSecret) > 0 {
		ee = append(ee, acl)

if a const is being used exactly once, then directly use the value.

Copy link
Contributor Author

@parasssh parasssh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dismissed @manishrjain from a discussion.
Reviewable status: 4 of 5 files reviewed, all discussions resolved (waiting on @manishrjain)


ee/utils_ee.go, line 41 at r1 (raw file):

Previously, manishrjain (Manish R Jain) wrote…

if a const is being used exactly once, then directly use the value.

Done.

@parasssh parasssh merged commit 51f8cfb into master Apr 27, 2020
@parasssh parasssh deleted the paras/ee_health branch April 27, 2020 17:27
parasssh pushed a commit that referenced this pull request Apr 27, 2020
parasssh pushed a commit that referenced this pull request Apr 28, 2020
…ble and GQL changes (#5293) (#5308) (#5304)

* /health endpoint now shows EE Features available (#5293)
(cherry-picked from commit 51f8cfb)

* GQL Changes for /health endpoint's Enterprise features info. (#5308)
(cherry-picked from commit b339a21)
dna2github pushed a commit to dna2fork/dgraph that referenced this pull request Jul 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Dgraph /health endpoint should indicate the Enterprise features enabled.
2 participants