Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

update prometheus-config to new format #2648

Merged
merged 2 commits into from
Nov 14, 2017

Conversation

krombel
Copy link
Contributor

@krombel krombel commented Nov 7, 2017

Prometheus changed its format from simple config file to YAML for version 2.0.0 (changelog)
But the configs provided by this repo does not reflect that change.

Signed-Off-By: Matthias Kesler [email protected]

@matrixbot
Copy link
Member

Can one of the admins verify this patch?

1 similar comment
@matrixbot
Copy link
Member

Can one of the admins verify this patch?

@@ -5,15 +5,20 @@ To use it, first install prometheus by following the instructions at

http://prometheus.io/

Then add a new job to the main prometheus.conf file:
Then add a new job to the main prometheus.yml file:
Copy link
Member

Choose a reason for hiding this comment

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

prometheus.yaml, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

prometheus.yml is working in my running setup

Copy link
Member

Choose a reason for hiding this comment

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

prometheus.yaml is working in my running setup

This restores the config that is usable for prometheus pre v2.0.0
The new config only works for Prometheus v2+
@richvdh
Copy link
Member

richvdh commented Nov 14, 2017

how about separate "contrib/prometheus-v1" and "contrib/prometheus-v2" directories? I think that woudl be clearer

@krombel
Copy link
Contributor Author

krombel commented Nov 14, 2017

The differences are only in different files for "synapse.rules" and some adjustment in the README. I can create two directories with two files each (README+synapse.rules) but I do not see the benefit...

But if you prefer it I will do it

@richvdh
Copy link
Member

richvdh commented Nov 14, 2017

hrm, if it wasn't for the console, then there would hardly be anything shared between v1 and v2

but fair enough

@richvdh richvdh merged commit 038c994 into matrix-org:develop Nov 14, 2017
@krombel
Copy link
Contributor Author

krombel commented Nov 14, 2017

Just for refence: I had to checkout the templates of the repos to use synapse.html that is in this repo. But synapse.html was usable without modification since I did that.

@richvdh
Copy link
Member

richvdh commented Nov 14, 2017

the templates of the repos?

@krombel
Copy link
Contributor Author

krombel commented Nov 14, 2017

@krombel krombel deleted the update_prometheus branch November 14, 2017 20:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants