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.

Sign up for GitHub

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

Jump to bottom

Support Operator 0.7.0 #91

Merged
merged 2 commits into from
Apr 3, 2017
Merged

Support Operator 0.7.0 #91

merged 2 commits into from
Apr 3, 2017

Conversation

goruha
Copy link
Member

@goruha goruha commented Apr 1, 2017

What

  • Made alertmanager config stored in secret
  • Made prometheus config stored in secret
  • Added support for prometheus rules selector
  • Added support to override prometheus configs in umbrella chart with resource ( not by values )
  • Added support to override prometheus rules in umbrella chart with resource ( not by values )
  • Added support to specify custom selector for prometheus ServiceMonitors
  • Added support to specify custom selector for prometheus rules configs

Why

  • Prometheus operator starting from version 0.7.0 use secrets to store configs
    https://github.com/coreos/prometheus-operator/releases/tag/v0.7.0
  • Provide flexible way to specify promethus config in umbrella chart resources (example you can find here Prometheus 2.1 #80 ). It is useful because configs sometimes required templating. Also prometheus chart should be very flexible to most use cases to be ported to official reps
  • Provide flexible way to specify prometheus rules in umbrella chart resources (example you can find here Prometheus 2.1 #80 ). It is useful because rules sometimes required templating. Also prometheus chart should be very flexible to most use cases to be ported to official reps
  • ServiceMonitor TPR was created to provide way when external charts create it's own ServiceMonitor for their own services. From that point of view we should provide way to specify custom selectors for ServiceMonitors. (example you can find here Prometheus 2.1 #80 )
  • Custom Rules useful to specify custom alerts. So we should support configurable rules config maps selector (example you can find here Prometheus 2.1 #80 )

@goruha goruha requested a review from osterman April 1, 2017 13:31
osterman
osterman reviewed Apr 2, 2017
View reviewed changes
incubator/alertmanager/templates/secret.yaml
release: {{ .Release.Name }}
name: alertmanager-{{ .Release.Name }}
data:
alertmanager.yaml: {{ include (print (dir $.Template.Name) "/_alertmanager.yaml.tpl") . | b64enc | quote }}
Copy link
Member

Choose a reason for hiding this comment

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

nice

Copy link
Member

Choose a reason for hiding this comment

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

why should alert manager.yaml be a secret as opposed to a configmap?

Copy link
Member

Choose a reason for hiding this comment

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

Prometheus operator starting from version 0.7.0 use secrets to store configs

Never mind - you explained it

osterman
osterman approved these changes Apr 2, 2017
View reviewed changes
Copy link
Member

@osterman osterman left a comment

Choose a reason for hiding this comment

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

Great writeup!

@goruha goruha merged commit 2c8ce38 into master Apr 3, 2017
@osterman osterman deleted the features-prometheus-charts-support-operator-0.7.0 branch April 4, 2017 03:12
goruha added a commit that referenced this pull request Apr 4, 2017
@goruha
Merge branch 'prometheus-2.1' of github.com:cloudposse/charts into pr…
6caa2c8 
…ometheus-2.1

* 'prometheus-2.1' of github.com:cloudposse/charts:
  Support Operator 0.7.0 (#91)
  Bump Grafana Chart Version (#90)
goruha added a commit that referenced this pull request Apr 9, 2017
@goruha
Merge branch 'master' into fix-jenkins
7abff2f 
* master: (24 commits)
  Revert back exporter-kube-state into kube-prometheus deps (#105)
  Fix charts CI\CD (#104)
  Add Support for Email Alerts in Prometheus Alert Manager (#103)
  Prometheus 2.1 (#80)
  Added prometheus custom alerts chart (#102)
  Added prometheus exporter kubelets (#93)
  Added prometheus exporter kube state (#94)
  Added prometheus exporter kube scheduler (#95)
  Added prometheus exporter kube etcd (#96)
  Added prometheus exporter kube controller manager (#98)
  Added prometheus exporter kube api (#99)
  Added prometheus exporter kubernetes (#100)
  Added prometheus exporter node (#101)
  Added prometheus exporter kube dns (#97)
  Added prometheus default selectors for rules and service Monitors (#92)
  Support Operator 0.7.0 (#91)
  Bump Grafana Chart Version (#90)
  Add Kubernetes State Exporter for Prometheus (#85)
  Add Grafana (#86)
  Add Prometheus Operator (#81)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@osterman osterman osterman approved these changes

Assignees

@goruha goruha

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@goruha @osterman