Commit Graph

62 Commits

Author SHA1 Message Date
Brian Christner 00a44359f9 Merge pull request #13 from llitfkitfk/version-2
Add AlertManager
2016-07-28 10:16:19 +02:00
paul 16fb60bfe7 update alertmanger config 2016-07-27 18:49:38 +08:00
paul 03117a3f35 add alert related dashboard json file 2016-07-27 18:48:24 +08:00
paul 7d246ab608 add slack integration 2016-07-27 18:27:31 +08:00
paul 29dc390edf add alertmanager 2016-07-27 16:09:16 +08:00
Brian Christner 945fb739c9 Update README.md 2016-07-14 14:25:35 +02:00
Brian Christner 1a1fd33b9c 1 - added Import Dashboard screenshot
2 - commited last changes for docker-compose
3 - this should be it for now
2016-07-14 14:19:55 +02:00
Brian Christner 327a47e910 resized add source screenshot
Resized crazy screenshot
2016-07-14 14:12:38 +02:00
Brian Christner e3167faf81 Delete New_server.png 2016-07-14 14:10:04 +02:00
Brian Christner c7e5ecc6ca Merge branch 'version-2' of https://github.com/vegasbrianc/prometheus into version-2 2016-07-14 14:07:35 +02:00
Brian Christner 523ff2700f Add final representation of Dashboard 2016-07-14 14:07:07 +02:00
Brian Christner 735dea1cb2 Update README.md
Instructions now reflect new stack which reflects:

1 - New docker-compose file (version 2)
2 - use all images directly from hub instead of building
3 - added networks front/back to separate services
4 - New Dashboard available via Grafana.net
5 - Grafana uses an env file to store passwords, etc
2016-07-14 14:06:31 +02:00
Brian Christner 1d2c5540f9 updated screenshots for data source 2016-07-14 13:58:34 +02:00
Brian Christner 50823a5492 added an images directory to store all instruction screenshots 2016-07-14 13:34:33 +02:00
Brian Christner 6140d7dcf4 removed old files and directories related to version 1 2016-07-14 13:29:20 +02:00
Brian Christner 9670f9eb0c added the prometheus directory + prometheus.yml file 2016-07-14 13:24:18 +02:00
Brian Christner f7fc2ab994 Added new Grafana/Prometheus Dashboard. Eww, Ahh, looks so pretty 2016-07-14 13:19:40 +02:00
Brian Christner 92b8d032ea 1 - Added networks to the docker-compose file to seperate internal and external services
2 - Added a container_name to prometheus for easier lookups in the Grafana Datasource
2016-07-14 09:21:08 +02:00
Brian Christner 349f525426 1 - remove prom directory
2 - updated docker-compose prometheus section as the config.js was being mounted as a directory and not a file in 1.12
3 - slight format chnages in docker-compose
2016-07-14 08:44:16 +02:00
Brian Christner fe78582338 Merge pull request #8 from philicious/master
Refactored deprecated services
2016-07-14 08:29:35 +02:00
cypherpunk 560d90d537 removed grafana version pinning 2016-07-13 15:47:57 +02:00
cypherpunk 28642518b1 added environment config file for the stack. only used by grafana so far 2016-07-13 14:37:04 +02:00
cypherpunk 8acb6e3bf1 updated prometheus config with node-exporter target 2016-07-13 14:35:35 +02:00
cypherpunk 9c6a93eddc refactored compose to use grafana over promdash, added node-exporter for host metrics and use upstream prometheus 2016-07-13 14:33:55 +02:00
Brian Christner 1dc3279f5b Merge pull request #5 from kumy/patch-1
Fix typo in README
2016-06-30 08:59:57 +02:00
kumy 6602add996 Fix typo in README 2016-06-29 22:27:38 +02:00
Brian Christner b4270d5af1 added Prometheus DAB file for 1.12 2016-06-28 13:28:38 +02:00
Brian Christner f57c24e2be changed compose file to download image from DockerHub instead of building 2016-06-28 10:34:13 +02:00
Brian Christner ac7e5186fa Update README.md
Rearranged sections
2015-12-22 21:36:57 +01:00
Brian Christner 45a347417f Update README.md
aded queries to the readme file
2015-12-22 21:35:13 +01:00
vegasbrianc a775354c09 final touches on labeling containers 2015-11-18 11:39:11 +01:00
vegasbrianc b22c48809f removed special characters from compose file and moved everything to labels 2015-11-18 11:29:15 +01:00
vegasbrianc 1129344fd8 wow a lot of changes happend since I set this up in October. I locked down the Prometheus version to 0.16.1, fixed the docker-compose to align the new config commands, and updated the prometheus.yml format to the new standard. 2015-11-18 10:52:09 +01:00
vegasbrianc d75036ea45 wow a lot of changes happend since I set this up in October. I locked down the Prometheus version to 0.16.1, fixed the docker-compose to align the new config commands, and updated the prometheus.yml format to the new standard. 2015-11-18 10:51:04 +01:00
Brian Christner 8fd61f32ac Update prometheus.yml
updated Prometheus file updated config
2015-11-17 16:44:48 +01:00
Brian Christner f7cc744eb2 Update docker-compose.yml
Updated the docker-compose file container variables.  It appears the docker-compose configuration option container_name changed to name in the latest version of docker-compose.
2015-11-17 16:24:31 +01:00
Brian Christner a005a0c359 Create dashboard_queries.txt
Added Promdash dashboard queries
2015-11-13 12:10:10 +01:00
Brian Christner 0d96bcb81a Update docker-compose.yml
Added links to the Prometheus container to exporter and cadvisor so comms is up right from the build
2015-11-09 14:03:57 +01:00
Brian Christner 923dceea23 Merge pull request #1 from dennari/dennari-patch-1
fix typo
2015-09-23 07:21:55 +02:00
Ville Väänänen 52b83a311f fix typo 2015-09-23 00:58:37 +03:00
Brian Christner d6481047a0 Update prometheus.yml
Added cAdvisor
2015-08-20 11:35:48 +02:00
Brian Christner 6a1b6c7e2a Update docker-compose.yml
Added cAdvisor container
2015-08-20 11:35:21 +02:00
Brian Christner 70fc818e72 Update README.md
Added additional ToDo
2015-08-19 13:31:31 +02:00
Brian Christner 1ee37588ed Update README.md 2015-08-19 12:22:46 +02:00
Brian Christner 252c916f09 Update README.md 2015-08-19 12:20:56 +02:00
Brian Christner a9902b2a91 Update README.md
Added screenshots and Dashboard config section
2015-08-19 11:18:46 +02:00
Brian Christner d630682e79 Merge branch 'master' of https://github.com/vegasbrianc/prometheus 2015-08-19 11:17:52 +02:00
Brian Christner e7f117f6d1 Added Dashboard screenshot 2015-08-19 11:17:08 +02:00
Brian Christner 187f25e9e1 Update README.md 2015-08-19 11:11:32 +02:00
Brian Christner 8db94bcd77 adjusted screenshot size 2015-08-19 11:10:53 +02:00