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

Grafana additional env for config changes #14796

Merged
merged 3 commits into from Jul 3, 2019

Conversation

@newtondev
Copy link
Contributor

commented Jun 13, 2019

Added section for configuring additional environment variable configs for grafana to override certain grafana.ini settings like adding SMTP settings.

Added section for configuring additional environment variable configs…
… for grafana to override certain grafana.ini settings like adding SMTP settings.
@googlebot

This comment has been minimized.

Copy link
Collaborator

commented Jun 13, 2019

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here (e.g. I signed it!) and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@istio-testing

This comment has been minimized.

Copy link
Collaborator

commented Jun 13, 2019

Hi @newtondev. Thanks for your PR.

I'm waiting for a istio member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@newtondev

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

@googlebot

This comment has been minimized.

Copy link
Collaborator

commented Jun 13, 2019

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.


env: # {}
# env_variable_name: value
GF_SMTP_ENABLED: true

This comment has been minimized.

Copy link
@douglas-reid

douglas-reid Jun 13, 2019

Contributor

I feel like this should default to false and the options below should just be examples.

This comment has been minimized.

Copy link
@newtondev

newtondev Jun 13, 2019

Author Contributor

Indeed, I commited it with demo values. Will comment out and add notes accordingly. Thanks

This comment has been minimized.

Copy link
@newtondev

newtondev Jun 13, 2019

Author Contributor

Moved the default values and also commented out example values to the install/kubernetes/helm/istio/charts/grafana/values.yaml file

@newtondev

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

Updated accordingly. Please let me know if you have any more questions or suggestions. Got it running on a production cluster today with GF_ env var settings in place and works like a charm. Thanks

Removed demo grafana config file. Moved the env and envSecrets values…
… to grafana chart values file with comments on how to use.
@howardjohn

This comment has been minimized.

Copy link
Member

commented Jun 13, 2019

Thanks for the changes , looks good now!

Will defer to @douglas-reid for approval though as he is the grafana expert

@stale

This comment has been minimized.

Copy link

commented Jun 27, 2019

This pull request has been automatically marked as stale because it has not had activity in the last 2 weeks. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

@stale stale bot added the stale label Jun 27, 2019

@newtondev

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

/ping

@stale stale bot removed the stale label Jul 3, 2019

@douglas-reid
Copy link
Contributor

left a comment

/lgtm

@howardjohn

This comment has been minimized.

Copy link
Member

commented Jul 3, 2019

/lgtm

@newtondev I think CLA is failing since you signed with a different email than your commit is getting sent with

@newtondev

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

I signed it!

@googlebot

This comment has been minimized.

Copy link
Collaborator

commented Jul 3, 2019

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: yes and removed cla: no labels Jul 3, 2019

@newtondev

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

/retest

@istio-testing

This comment has been minimized.

Copy link
Collaborator

commented Jul 3, 2019

@newtondev: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@newtondev

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

/lgtm

@newtondev I think CLA is failing since you signed with a different email than your commit is getting sent with

Hi @howardjohn , I see I was using my work email address. I have added it to my account and have signed the CLI with that email address as well. Thanks

@howardjohn

This comment has been minimized.

Copy link
Member

commented Jul 3, 2019

/ok-to-test

@istio-testing

This comment has been minimized.

Copy link
Collaborator

commented Jul 3, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: douglas-reid, howardjohn, newtondev

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@newtondev

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

/retest

@istio-testing istio-testing merged commit c5ff36a into istio:master Jul 3, 2019

45 of 49 checks passed

prow/integ-mixer-k8s-presubmit-tests.sh Job failed.
Details
prow/istio-pilot-multicluster-e2e.sh Job failed.
Details
prow/integ-new-installer-k8s-presubmit-tests.sh Job triggered.
Details
prow/integ-security-k8s-presubmit-tests.sh Job triggered.
Details
GolangCI No issues found!
Details
Summary 1 potential rule
Details
ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: codecov Your tests passed on CircleCI!
Details
ci/circleci: e2e-dashboard Your tests passed on CircleCI!
Details
ci/circleci: e2e-mixer-noauth-v1alpha3-v2 Your tests passed on CircleCI!
Details
ci/circleci: e2e-pilot-auth-v1alpha3-v2 Your tests passed on CircleCI!
Details
ci/circleci: e2e-pilot-auth-v1alpha3-v2-non-mcp Your tests passed on CircleCI!
Details
ci/circleci: e2e-pilot-cloudfoundry-v1alpha3-v2 Your tests passed on CircleCI!
Details
ci/circleci: e2e-pilot-noauth-v1alpha3-v2 Your tests passed on CircleCI!
Details
ci/circleci: e2e-simple Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: racetest Your tests passed on CircleCI!
Details
ci/circleci: shellcheck Your tests passed on CircleCI!
Details
ci/circleci: test Your tests passed on CircleCI!
Details
cla/google All necessary CLAs are signed
prow/codecov.sh Job succeeded.
Details
prow/e2e-bookInfoTests-trustdomain.sh Job succeeded.
Details
prow/e2e-bookInfoTests-v1alpha3.sh Job succeeded.
Details
prow/e2e-dashboard.sh Job succeeded.
Details
prow/e2e-mixer-no_auth.sh Job succeeded.
Details
prow/e2e-pilot-cloudfoundry-v1alpha3-v2.sh Skipped.
prow/e2e-simpleTests.sh Job succeeded.
Details
prow/e2e_pilotv2_auth_sds.sh Job succeeded.
Details
prow/integ-framework-k8s-presubmit-tests.sh Job succeeded.
Details
prow/integ-framework-local-presubmit-tests.sh Job succeeded.
Details
prow/integ-galley-k8s-presubmit-tests.sh Job succeeded.
Details
prow/integ-galley-local-presubmit-tests.sh Job succeeded.
Details
prow/integ-istioctl-k8s-presubmit-tests.sh Job succeeded.
Details
prow/integ-istioctl-local-presubmit-tests.sh Job succeeded.
Details
prow/integ-mixer-local-presubmit-tests.sh Job succeeded.
Details
prow/integ-pilot-k8s-presubmit-tests.sh Job succeeded.
Details
prow/integ-pilot-local-presubmit-tests.sh Job succeeded.
Details
prow/integ-security-local-presubmit-tests.sh Job succeeded.
Details
prow/integ-telemetry-k8s-presubmit-tests.sh Job succeeded.
Details
prow/integ-telemetry-local-presubmit-tests.sh Job succeeded.
Details
prow/istio-integ-k8s-tests.sh Skipped.
prow/istio-integ-local-tests.sh Skipped.
prow/istio-lint.sh Job succeeded.
Details
prow/istio-pilot-e2e-envoyv2-v1alpha3.sh Job succeeded.
Details
prow/istio-unit-tests.sh Job succeeded.
Details
prow/racetest.sh Job succeeded.
Details
prow/release-test.sh Job succeeded.
Details
prow/shellcheck.sh Job succeeded.
Details
tide In merge pool.
Details
@istio-testing

This comment has been minimized.

Copy link
Collaborator

commented Jul 3, 2019

@newtondev: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
prow/istio-pilot-multicluster-e2e.sh 61760f4 link /test istio-pilot-multicluster-e2e-master
prow/integ-mixer-k8s-presubmit-tests.sh 61760f4 link /test integ-mixer-k8s-presubmit-tests-master
prow/integ-new-installer-k8s-presubmit-tests.sh 61760f4 link /test integ-new-install-k8s-presubmit-tests-master
prow/integ-security-k8s-presubmit-tests.sh 61760f4 link /test integ-security-k8s-presubmit-tests-master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@newtondev newtondev deleted the newtondev:feature/config-grafana-env branch Jul 3, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.