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

Prometheus 2.1 #80

Merged
merged 67 commits into from
Apr 5, 2017
Merged

Prometheus 2.1 #80

merged 67 commits into from
Apr 5, 2017

Conversation

goruha
Copy link
Member

@goruha goruha commented Mar 22, 2017

what

  • Implement Prometheus umbrella chart

why

  • Comprehensive, extensible monitoring framework

Michael Goodness added 30 commits January 21, 2017 15:23

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* use prometheus-operator v0.2.3
* use prometheus-operator v0.2.3
* use Grafana v4.1.1
* use Prometheus v1.5.0
* updated TLS validation settings
@goruha goruha mentioned this pull request Apr 1, 2017
{ "items": [
{
"key": "{{ .Release.Namespace }}/prometheus-{{ .Release.Name }}-rules",
"checksum": "33bbd11f3d6ecfa14af3d46c46e91de4906fe86d2429f34ba6ee74082f9d6414"
Copy link
Member

Choose a reason for hiding this comment

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

Why is this checksum hardcoded?

Copy link
Member

Choose a reason for hiding this comment

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

If we need to hardcode it, then how to calculate it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@@ -2,7 +2,7 @@
{{- if and .Values.rules.specifiedInValues .Values.rules.value }}
{
"key": "{{ .Release.Namespace }}/prometheus-{{ .Release.Name }}-rules",
"checksum": "mock_hash"
"checksum": "0000000000000000000000000000000000000000000000000000000000000000"
Copy link
Member

Choose a reason for hiding this comment

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

Did it need to be a certain length?

Copy link
Member

Choose a reason for hiding this comment

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

@goruha

just try to make it same length as original to reduce risk of bug

@osterman
Copy link
Member

osterman commented Apr 5, 2017

+2

@goruha goruha merged commit 87b3f5d into master Apr 5, 2017
@goruha goruha deleted the prometheus-2.1 branch April 5, 2017 20:56
goruha added a commit that referenced this pull request Apr 6, 2017
* master:
  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)
goruha added a commit that referenced this pull request Apr 9, 2017
* 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants