Skip to content

Update core server components and add additional flag settings #5

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

Merged
merged 2 commits into from
Jan 19, 2018
Merged

Update core server components and add additional flag settings #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b44568
Update core server components and add additional flag settings
danivovich Jan 19, 2018
f70b2a9
Update readme
danivovich Jan 19, 2018
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
10 changes: 6 additions & 4 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
---
prometheus_version: 2.0.0
prometheus_checksum: e12917b25b32980daee0e9cf879d9ec197e2893924bd1574604eb0f550034d46
prometheus_version: 2.1.0
prometheus_checksum: f181f619c9a8e0750c1ac940eb00a0881cc50386d896f06f159e9a5b68db60a0

alertmanager_version: 0.10.0
alertmanager_checksum: ef09b9c9795a7148fd74bb1dcecdd00a4fa25da05a4d2b8517e6ceb5f124e1a8
alertmanager_version: 0.13.0
alertmanager_checksum: fe79ef985c02f67e82684b8ac6a62a1c93a3c297d8b969a639af23548154772a

grafana_ini_file: grafana.ini
prometheus_config_file: prometheus.yml
prometheus_alert_file: alertmanager.yml
alertmanager_enabled: true
prometheus_extra_flags: ""
Copy link
Contributor

@oestrich oestrich Jan 19, 2018

Choose a reason for hiding this comment

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

README update for these?

Copy link
Member Author

@danivovich danivovich Jan 19, 2018

Choose a reason for hiding this comment

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

updated

alertmanager_extra_flags: ""

prometheus_postgresql_archive: false
prometheus_postgresql_database: metrics
Expand Down
2 changes: 1 addition & 1 deletion templates/alertmanager.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ User=prometheus
Restart=on-failure
WorkingDirectory=/home/prometheus/alertmanager/{{ alertmanager_version }}/alertmanager
ExecStart=/home/prometheus/alertmanager/{{ alertmanager_version }}/alertmanager/alertmanager \
-config.file=/home/prometheus/alertmanager.yml
--config.file=/home/prometheus/alertmanager.yml {{ alertmanager_extra_flags }}

[Install]
WantedBy=multi-user.target
Expand Down
2 changes: 1 addition & 1 deletion templates/prometheus.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ User=prometheus
Restart=on-failure
WorkingDirectory=/home/prometheus/{{ prometheus_version }}/prometheus
ExecStart=/home/prometheus/{{ prometheus_version }}/prometheus/prometheus \
--config.file=/home/prometheus/prometheus.yml
--config.file=/home/prometheus/prometheus.yml {{ prometheus_extra_flags }}

[Install]
WantedBy=multi-user.target
Expand Down