5 Commits

Author	SHA1	Message	Date
Max Inden	26d1dc86c9	Merge pull request #1229 from mxinden/move-serv-mon-to-target ... kube-prometheus: Move service monitors to target folder	2018-04-18 14:15:26 +02:00
Max Leonard Inden	971ed1010e	kube-prometheus: Move service monitors to target folder ... With 1d00e0ab ("ServiceMonitor: Enable Prometheus to select ServMon outside own ns") merged: To emphasize the fact, that ServiceMonitors can be deployed alongside their targets, this patch moves the Alertmanager, Kube-State-Metrics, Node-Exporter and Prometheus Operator Service-Monitor into the respective target folder in the kube-prometheus project.	2018-04-18 13:44:45 +02:00
Joakim Karlsson	f6dae8bd71	updated jsonnet code	2018-04-18 12:52:58 +02:00
Frederic Branczyk	507617e150	Remove old manifests and replace with jsonnet build	2018-04-13 13:36:34 +02:00
Frederic Branczyk	d8692794a9	kube-prometheus: Convert to jsonnet	2018-04-11 18:51:35 +02:00