Signed-off-by: Jesus Vazquez 3362bf6d79

Fix merge conflicts ...

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>

2022-10-11 22:53:37 +05:30

..

custom-sd

Check syntax of example configurations (#10753)

2022-05-26 18:17:21 +10:00

kubernetes-rabbitmq

fixes yamllint errors

2021-06-12 12:47:47 +02:00

remote_storage

Fix merge conflicts

2022-10-11 22:53:37 +05:30

Makefile

Check syntax of example configurations (#10753)

2022-05-26 18:17:21 +10:00

prometheus-agent.yml

config: Make remote-write required for Agent mode (#9618)

2021-10-30 01:41:40 +02:00

prometheus-digitalocean.yml

fixes yamllint errors

2021-06-12 12:47:47 +02:00

prometheus-docker.yml

fixes yamllint errors

2021-06-12 12:47:47 +02:00

prometheus-dockerswarm.yml

fixes yamllint errors

2021-06-12 12:47:47 +02:00

prometheus-eureka.yml

Add Eureka Service Discovery (#3369)

2020-08-26 17:36:59 +02:00

prometheus-hetzner.yml

Check syntax of example configurations (#10753)

2022-05-26 18:17:21 +10:00

prometheus-ionos.yml

Add service discovery for IONOS Cloud (#10514)

2022-05-20 14:57:23 +02:00

prometheus-kubernetes.yml

documentation: align kubernetes example with the prom operator and mixins

2021-11-22 11:13:47 +01:00

prometheus-linode.yml

Fixed spacing causing "field credentials not found in type linode.plain” error (#10752)

2022-05-25 22:46:02 +02:00

prometheus-marathon.yml

fixes yamllint errors

2021-06-12 12:47:47 +02:00

prometheus-nomad.yml

feat(nomad): add nomad service discovery

2022-06-30 14:17:08 +02:00

prometheus-puppetdb.yml

docs: Improve PuppetDB example (#9547)

2021-10-20 21:03:17 +02:00

prometheus-scaleway.yml

add support for scaleway service discovery (#8555)

2021-03-10 15:10:17 +01:00

prometheus-uyuni.yml

Add Uyuni service discovery (#8190)

2021-10-19 01:00:44 +02:00

prometheus-vultr.yml

Check syntax of example configurations (#10753)

2022-05-26 18:17:21 +10:00

prometheus.yml

fixes yamllint errors

2021-06-12 12:47:47 +02:00

rbac-setup.yml

fixes yamllint errors

2021-06-12 12:47:47 +02:00

web-config.yml

Fix a broken link for the bcrypt ref. at the web-config.yml example

2021-04-20 22:43:37 +02:00