Commit graph

19 commits

Author SHA1 Message Date
Bartosz Kupidura
37925ad206 Get kubernetes status from grains
Change-Id: If921742f5f2601bcd974922d272f0d8f4aa2b0b0
2017-09-20 12:17:23 +02:00
Bartosz Kupidura
dc36045033 Allow to pass metrics_path for static jobs
Change-Id: Ifa4fa71241bf8d2c7e0a4960192d3499252516aa
2017-08-21 11:32:02 +02:00
Bartosz Kupidura
d949dcef88 Revert "Add Jenkins to Prometheus targets"
This reverts commit db1f492198.

Change-Id: I4db9c61f1061021e02e2e28ce6132449a7cb5586
2017-08-21 09:18:58 +00:00
Konstantin Hontar
db1f492198 Add Jenkins to Prometheus targets
Change-Id: Ie9853b9860b34536ded4a7583c48c735e75bb7b7
2017-08-18 13:12:03 +03:00
Bartosz Kupidura
94c1a3c99a Pass all options for static target from formula
Change-Id: I21c84341d5a585862d21f75a4d263f8f5781675d
2017-08-04 18:33:56 +02:00
Simon Pasquier
1ac10079c9 Split infra and workload monitoring for K8S
This change allows to enable the monitoring only for the K8S
infrastructure (default) or for both the infrastructure and the
workloads running on top of K8S.

Change-Id: Idc68576f2d64840c0454fadc204174027bbaa454
2017-07-19 12:00:03 +02:00
Olivier Bourdon
e1539aee0e Add Prometheus metrics relabel configuration for exporters
Tested succesfully with the following test cases:
            source_labels: instance
            source_labels: instance,__name__,test
            source_labels: [instance,__name__,test]
            source_labels:
              - instance
              - __name__
              - test

Change-Id: I9750bb0a4204335dd202cc4020445e850824c497
Depends-On: I2f85fe2f9cc67d2d03d5e8dad5ac0b74e82b0fcc
2017-06-29 11:01:15 +02:00
Bartosz Kupidura
9a986bebf7 Merge grains with pillars for static targets
Change-Id: I2f85fe2f9cc67d2d03d5e8dad5ac0b74e82b0fcc
2017-06-28 09:22:42 +02:00
Aleksey Kasatkin
ba40adbc35 Fix typo in job name for k8s services in prometheus.yml
Right wording is:

    job_name: 'kubernetes-service-endpoints'

E.g., see 14d0604aba/documentation/examples/prometheus-kubernetes.yml (L97)

Change-Id: I997ffc96b1ab6b81e2e634d0be48ad73daf2f077
2017-06-26 13:42:45 +00:00
Bartosz Kupidura
13f39f2ac1 Add remote_write
Minor fix for application naming

Change-Id: Ie725b43a5aa9967c31ef482429176bccc21d9f02
2017-05-30 11:42:58 +02:00
Bartosz Kupidura
e7de11cf46 Use builtin autodiscovery of alertmanager
Change-Id: I36bdb3a4e90687d32724e5e248d5862567c36f83
Depends-On: I91e23f17858deb2ef937fcd42948641eb371474b
2017-05-25 10:46:56 +02:00
Bartosz Kupidura
abec256072 Create data directory for am and prometheus
Change-Id: Ie89009480c06cafb15bb06ded263e49ef194dfc9
2017-05-22 10:56:34 +02:00
Bartosz Kupidura
bb791375c6 Disable by default kubernetes and dns target
Change-Id: Ie5ad3d8b630d2e634f143099641f06aa9f75e30f
2017-05-12 17:30:35 +02:00
Martin Polreich
1404088f3c Added ability to disable endpoints, alerts and
recording rules and override alerts/recording
rules from reclass

Change-Id: Ie79409f350f4e7d223955c177718350c38ed8302
2017-04-28 11:03:21 +02:00
Bartosz Kupidura
9f4d99cb3a Add more generic auto-discovery for statics
Change-Id: I4d20d6f126ec4698bbdae34c8476fe325363bced
2017-04-13 10:21:19 +02:00
Bartosz Kupidura
453e290495 Add ssl options for etcd
Change-Id: I45afdf25d8d3ebc1ceab4a38d8cc61435fed1700
2017-03-30 15:43:41 +02:00
Bartosz Kupidura
8642002cf8 Get dns autodiscovery from reclass
Change-Id: I8850be1a118662ebf75a3e0fc2540691ab027220
2017-03-30 12:05:57 +02:00
Bartosz Kupidura
597b0678bf Better grain handling for telegraf
Replace '-' to '_' in prometheus config dir
Add possibility to add recording rules

Change-Id: Ifc85a95ae62cb0f1b810a3b4f718e8d92f9c6209
2017-03-29 13:54:26 +02:00
Bartosz Kupidura
2f70396a78 Add prometheus, alertmanager, pushgateway configs
Change-Id: I7f146e0207ada58f0723b14d0a625a6bce67ea9f
2017-03-17 17:50:23 +01:00