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

Prometheus 2.1 #80

Merged
merged 67 commits into from
Apr 5, 2017
Merged

Prometheus 2.1 #80

Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
53890e9
Initial commit
Jan 21, 2017
d1ef070
Renamed Deployment dashboard -> Deployments
Jan 23, 2017
0fc1109
Added Makefile
Jan 24, 2017
b6babb8
prometheus-operator v0.1.2
Jan 24, 2017
89ff91b
kube-prometheus v0.1.1
Jan 24, 2017
acda5ca
grafana: added Prometheus Stats dashboard
Jan 26, 2017
11a9fb8
grafana: updated dashboards to v4.1.1
Jan 26, 2017
d0ac1a9
grafana: added inputs section to dashboards
Jan 26, 2017
32f5916
Prep for TPRs working
Jan 30, 2017
3a208bb
Separate TPR hooks
Jan 30, 2017
fce4e79
Jobs fixes
Jan 31, 2017
ecced6f
Cleanup services
Jan 31, 2017
4b5b40a
Hardcoded alertmanager & prometheus names
Jan 31, 2017
052da03
prometheus-operator v0.4.0
Feb 16, 2017
eff1967
standalone prometheus (TPR) chart
Feb 16, 2017
29a04c4
Operator v0.6.0; improved cleanup
Mar 2, 2017
ff7ba21
Fixed operator cleanup job
Mar 3, 2017
9c8abaf
Allow nodeSelector for operator
Mar 3, 2017
cd51faa
No default resources; ClusterIP service
Mar 3, 2017
2041bf0
Only create configmap if there's config
Mar 3, 2017
5a689f7
Created alertmanager chart
Mar 4, 2017
4532650
Prometheus chart creates ServiceMonitors
Mar 4, 2017
1e266eb
Updated README & Makefile
Mar 5, 2017
1a4a53b
Reverted chart versions to v0.1.0
Mar 5, 2017
de8e448
README
Mar 5, 2017
2abc744
Renamed manifests
Mar 5, 2017
a9277b9
Back to basics
Mar 5, 2017
8d3d25f
Values tweaks
Mar 6, 2017
4a257ff
README
Mar 6, 2017
91bf8bd
Added chart READMEs
Mar 6, 2017
79343bc
No Makefile
Mar 6, 2017
868d2af
Removed kube-prometheus from README
Mar 9, 2017
3784661
Remove old charts
goruha Mar 16, 2017
f1506d6
Added kube-prometheus-charts
goruha Mar 16, 2017
bda063d
Added node exporter
goruha Mar 22, 2017
82bed2f
Added exporters
goruha Mar 24, 2017
c587edd
Split charts
goruha Mar 26, 2017
123c6f7
Remove unnecessary charts
goruha Mar 26, 2017
2205ab4
Update requirements
goruha Mar 26, 2017
40f4245
Merge branch 'master' into prometheus-2.1
goruha Mar 27, 2017
86df355
Merge master
goruha Mar 27, 2017
d540673
Fix prometheus-operator
goruha Mar 27, 2017
1c35bb8
Fix prometheus operator
goruha Mar 27, 2017
ff8b95c
Fix prometheus operator
goruha Mar 27, 2017
bb7026f
Fix prometheus operator
goruha Mar 27, 2017
3fb4e40
Add lock files to gitignore
goruha Mar 27, 2017
02c84b5
Fix kube-prometheus
goruha Mar 27, 2017
f435824
Port prometheus charts to support prometheus 0.7.0
goruha Apr 1, 2017
599b8cf
Remove deps
goruha Apr 1, 2017
336d0d8
Fix rules for prometheus
goruha Apr 1, 2017
5952b10
Added exporters
goruha Apr 1, 2017
951061f
Added exporters
goruha Apr 3, 2017
efc5d97
Merge branch 'master' into prometheus-2.1
goruha Apr 3, 2017
f443b92
Current prometheus state
goruha Apr 4, 2017
3072e71
Current prometheus state
goruha Apr 4, 2017
6caa2c8
Merge branch 'prometheus-2.1' of github.com:cloudposse/charts into pr…
goruha Apr 4, 2017
ac92e01
Merge branch 'master' into prometheus-2.1
goruha Apr 4, 2017
76cbe21
Fix requirements
goruha Apr 4, 2017
646b19e
Fix requirements
goruha Apr 4, 2017
298ac70
Update deployment.yaml
goruha Apr 4, 2017
48ff26f
Fix prometheus chart
goruha Apr 4, 2017
489941b
Merge branch 'prometheus-2.1' of github.com:cloudposse/charts into pr…
goruha Apr 4, 2017
daef164
Revert back name
goruha Apr 4, 2017
f81159d
Changed default service monitor and rules selector.
goruha Apr 4, 2017
c425448
Changed hash sum to all 0 because it is mock hash
goruha Apr 5, 2017
1fbd2c5
Changed hash sum to all 0 because it is mock hash
goruha Apr 5, 2017
e8f6017
Merge branch 'master' into prometheus-2.1
goruha Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion incubator/prometheus/templates/_configmaps.json.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

}
{{- end }}
]}