Commit Graph

139 Commits

Author SHA1 Message Date
Stefan Prodan
877ec9a506 Set push gateway tag to v0.6.0 v2.1.0 2018-12-04 12:09:13 +07:00
Amir Zarrinkafsh
d4c140d6d5 Merge pull request #117 from stefanprodan/fix-alerts-README.md
Fix alert rule references in the README.md
2018-12-04 16:05:26 +11:00
Amir Zarrinkafsh
3d8fec8c75 Fix alert rule references in the README.md 2018-12-04 16:00:52 +11:00
Stefan Prodan
8ea5ce7167 Merge pull request #115 from nightah/node_exporter-0.17.0
Update node_exporter to v0.17.0
2018-12-03 06:20:13 +02:00
Amir Zarrinkafsh
643f9cedce Update node_exporter to v0.17.0 2018-12-01 21:26:27 +11:00
Stefan Prodan
2eb51d192c Merge pull request #112 from nightah/master
Update monitor_services dashboard to include Prometheus 2.x metrics
2018-11-24 11:27:52 +02:00
Amir Zarrinkafsh
4b308afd5a Update/clean up monitor_services dashboard to include Prometheus 2.x metrics
(credit to https://grafana.com/dashboards/6725)
2018-11-24 17:24:42 +11:00
Stefan Prodan
206738bebd Merge pull request #110 from nightah/master
Update cAdvisor and Grafana to latest versions
2018-11-14 09:37:48 +02:00
Amir Zarrinkafsh
485836df36 Merge branch 'master' of https://github.com/stefanprodan/dockprom 2018-11-14 17:47:35 +11:00
Amir Zarrinkafsh
0df5d3c9e5 Update grafana to v5.3.4 2018-11-14 17:39:10 +11:00
Amir Zarrinkafsh
85ee348c63 Update cadvisor to v0.32.0 2018-11-14 17:38:36 +11:00
Stefan Prodan
0529e72f52 Remove heap size flag
fix #109
2018-11-13 17:31:27 +02:00
Stefan Prodan
7de6a2c89c Merge pull request #108 from nightah/master
Update alertmanager to v0.15.3
2018-11-13 09:57:47 +02:00
Amir Zarrinkafsh
86c963c524 Update alertmanager to v0.15.3 2018-11-12 20:20:52 +11:00
Stefan Prodan
9d0f6ab00e Merge pull request #106 from nightah/master
Update Prometheus to v2.5.0
2018-11-08 11:36:19 +02:00
Amir Zarrinkafsh
f79a1e693d Update prometheus to v2.5.0 2018-11-07 19:59:01 +11:00
Stefan Prodan
0c9df3423d Merge pull request #105 from nightah/revert-102-master
Upgrade Grafana to v5.3.2
2018-10-26 12:42:14 +03:00
Amir Zarrinkafsh
e83017c409 Update grafana to v5.3.2 2018-10-26 20:11:51 +11:00
Amir Zarrinkafsh
0b2393c15c Revert "Utilise Grafana active provisioning system" 2018-10-26 20:07:24 +11:00
Stefan Prodan
bb7d544097 Merge pull request #102 from nightah/master
Utilise Grafana active provisioning system
2018-10-22 20:25:24 +03:00
Amir Zarrinkafsh
fc5b592ea6 Small nitpick on volume mapping 2018-10-22 22:53:22 +11:00
Amir Zarrinkafsh
65faa2fe2c Add datasource and dashboard via active provisioning system 2018-10-22 22:48:35 +11:00
Stefan Prodan
7abdf68208 Merge pull request #100 from mikephung/master
added config file for credentials and updated README.md how to use it…
2018-10-19 11:48:14 +02:00
Phung Mike
b044344fbd added config file for credentials and updated README.md how to use it and how to change the password correctly 2018-10-19 09:48:01 +02:00
Stefan Prodan
5ec3ce13d5 Merge pull request #99 from nightah/master
Update cAdvisor, Prometheus and Grafana to latest versions
2018-10-18 11:39:17 +02:00
Amir Zarrinkafsh
6968b85e2e Update grafana to v5.3.1 2018-10-17 20:38:38 +11:00
Amir Zarrinkafsh
e7495320f3 Update prometheus to v2.4.3 2018-10-17 20:38:01 +11:00
Amir Zarrinkafsh
cc9ff0743a Update cadvisor to v0.31.0 2018-10-17 20:37:04 +11:00
Stefan Prodan
f853464f8f Merge pull request #97 from nightah/master
Update to latest releases and fix permission issue on initial dashboard creation
2018-09-23 11:38:21 +03:00
Amir Zarrinkafsh
a07cf04352 Update grafana to v5.2.4 2018-09-23 15:26:16 +10:00
Amir Zarrinkafsh
09dc7c714e Update alertmanager to v0.15.2 2018-09-23 15:25:50 +10:00
Amir Zarrinkafsh
754a13cefd Update prometheus to v2.4.2 2018-09-23 15:25:21 +10:00
Amir Zarrinkafsh
52e11173c4 Fix permissions issue on initial dashboard creation 2018-09-23 15:18:05 +10:00
Stefan Prodan
829129d782 Merge pull request #93 from nightah/master
Update to latest releases
2018-08-14 13:04:58 +03:00
Amir Zarrinkafsh
5e075a5a3c Update docker-compose.exporters.yml to include node-exporter v0.16.0 2018-08-12 14:38:43 +10:00
Amir Zarrinkafsh
6e6534f51e Update dashboards, alerts and README to reflect changes in node-exporter v0.16.0 2018-08-12 14:37:35 +10:00
Amir Zarrinkafsh
dcdd37ca1f Update node-exporter to v0.16.0 2018-08-12 14:17:53 +10:00
Amir Zarrinkafsh
b110034baa Included update instructions for grafana v5.2.2 2018-08-12 14:15:13 +10:00
Amir Zarrinkafsh
23cc2e43a6 Update grafana to v5.2.2 2018-08-12 13:49:45 +10:00
Amir Zarrinkafsh
6f35d5cf52 Update alertmanager to v0.15.1 2018-08-12 13:47:34 +10:00
Amir Zarrinkafsh
27c7cf7481 Update prometheus to v2.3.2 2018-08-12 13:46:38 +10:00
Stefan Prodan
dbd8f15e1d Merge pull request #83 from sebastianzillessen/feature/addPushgateway
Add Prometheus Pushgateway to the docker-compose infrastructure.
v2.0.0
2018-05-28 20:06:28 +03:00
Sebastian Zillessen
95d90fae36 Add Prometheus Pushgateway to the docker-compose infrastructure. 2018-05-28 18:09:10 +02:00
Stefan Prodan
0861f6bd89 Merge pull request #79 from ptemplier/patch-1
Fix typo
2018-05-05 15:08:43 +02:00
Pierre Templier
bcdabffdb6 Typo on high 2018-05-05 08:32:57 +02:00
Stefan Prodan
fbcc4c6152 fix #62 2018-03-02 14:53:22 +02:00
Stefan Prodan
019615249e update Prometheus to v2.2.0-rc.0
update Alertmanager to v0.14.0
fix #59
2018-02-16 09:38:46 +02:00
Stefan Prodan
cbc498f23b Merge pull request #57 from ScottBrenner/patch-1
Grafana 4.6.2 -> 4.6.3
2018-01-25 11:24:16 +02:00
Stefan Prodan
e27706c7e6 Merge pull request #58 from ScottBrenner/patch-2
Alerting rules update
2018-01-25 11:14:51 +02:00
Scott Brenner
357f7021b9 Alerting rules update
Seems these three rule alert files were merged into `alert.rules`, changed `prometheus.yml` to update this. `README.md` references the three missing rule alert files and should be updated as well.
2018-01-24 12:50:27 -08:00