Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/prometheus] extra environment variable for alert manager #1237

Merged
merged 2 commits into from
Jul 5, 2017
Merged

[stable/prometheus] extra environment variable for alert manager #1237

merged 2 commits into from
Jul 5, 2017

Conversation

joosthofman
Copy link
Contributor

this is needed for example to add the http_proxy so alert manager can connect to external applications if behind a proxy.

Added a map of extra environment variable for the alertmanager, this …
46ecaf3 
…is needed to add the http_proxy so alert manager can connect to external applications if behind a proxy
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://github.com/kubernetes/kubernetes/wiki/CLA-FAQ to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

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.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Jun 4, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @joosthof. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot 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.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 4, 2017
@joosthofman
Copy link
Contributor Author

Signed CLA, commit is with different e-mail.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 5, 2017
@unguiculus unguiculus requested a review from mgoodness June 14, 2017 20:31
@unguiculus
Copy link
Member

@k8s-bot ok to test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 14, 2017
@unguiculus
Copy link
Member

/cc @mgoodness

@viglesiasce viglesiasce merged commit 4c4b799 into helm:master Jul 5, 2017
lachie83 added a commit to lachie83/charts that referenced this pull request Jul 10, 2017
@lachie83
Merge remote-tracking branch 'upstream/master'
d08422a 
* upstream/master: (67 commits)
  Fix json whitespace (helm#1458)
  Use consistent whitespace in template placeholders (helm#1437)
  [stable/selenium] Make hub readiness probe timeout configurable (helm#1391)
  [stable/kube2iam]: add rbac support (helm#1286)
  [stable/traefik] Allow enabling traefik access logs (helm#1302)
  Add Stash chart (helm#1420)
  Add Gearman G2 chart (helm#1421)
  add option to include tolerations to daemonset (helm#1364)
  Moved Artifactory to stable and updated version to 5.3.2 (helm#1314)
  Concourse postgres conditional dependency (helm#1390)
  Typo in helm install command for dask-distributed (helm#1413)
  [stable/fluent-bit] Fluent Bit v0.11.12 (helm#1417)
  fixed cassandra chart's persistence bug (helm#1245)
  Prometheus: modify config to support k8s 1.6 by default (helm#1080)
  Add rocket.chat (helm#752)
  Fix influxdb deployment (helm#1424)
  feat(stable/etcd-operator): add support for supplying additional command args (helm#1418)
  add configurable service annotations helm#1234 (helm#1244)
  [stable/prometheus] extra environment variable for alert manager (helm#1237)
  [stable/heapster] Default service name to Heapster (helm#1266)
  ...
yanns pushed a commit to yanns/charts that referenced this pull request Jul 28, 2017
@joosthofman
[stable/prometheus] extra environment variable for alert manager (hel…
5220a9a 
…m#1237)

* Added a map of extra environment variable for the alertmanager, this is needed to add the http_proxy so alert manager can connect to external applications if behind a proxy

* Update Chart.yaml
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@viglesiasce viglesiasce viglesiasce approved these changes

@mgoodness mgoodness Awaiting requested review from mgoodness

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. code reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@joosthofman @k8s-ci-robot @unguiculus @viglesiasce