Commit Graph
88 Commits
Author SHA1 Message Date
Brian Christner 144aad585f Added an Issue Template
Finally, adding an issue template to make troubleshooting easier
2017-10-09 21:27:59 +02:00
Brian Christner a0058ac659 Code of Conduct added 2017-10-09 17:09:59 +02:00
Brian Christner e19871a8af Added MIT License 2017-10-09 17:08:22 +02:00
Brian Christner 726a4d9741 updated README and compose file 2017-09-29 07:36:33 +02:00
Brian Christner 0dd341b1cf removed deprecated container_name from compose file 2017-09-19 23:00:36 +02:00
Brian Christner f5d6df9d1d Merge branch 'huegelc-huegelc-patch-expose-consoles' into version-2 2017-09-12 15:22:51 +02:00
Brian Christner 75c0e603f3 added node as job in order to enable console visualizations 2017-09-12 15:21:25 +02:00
Brian Christner 80b35e19ce Merge branch 'huegelc-patch-expose-consoles' of https://github.com/huegelc/prometheus into huegelc-huegelc-patch-expose-consoles 2017-09-12 15:01:40 +02:00
Brian Christner b186431c15 Merge branch 'LeoWinterDE-version-2' into version-2
Mereged the auto restart policy to services: Prometheus, node-exporter, and cAdvisor. Grafana is not required to maintain monitoring.
2017-09-12 14:53:43 +02:00
Brian Christner 4b4436a766 Merge pull request #52 from minac/patch-1
Update README
2017-08-17 12:44:34 +02:00
Brian Christner cb704e380b Merge branch 'llitfkitfk-swarm-mode' into version-2
Merging the Swarm support
2017-08-17 09:57:21 +02:00
Brian Christner 832be55eea updated README with projects using this Repo 2017-08-09 12:08:01 +02:00
Brian Christner 5e8c1c8bba updated README with projects using this Repo 2017-08-09 12:07:44 +02:00
Brian Christner b553a533b9 Merge branch 'version-2' of github.com:vegasbrianc/prometheus into version-2 2017-08-08 11:52:24 +02:00
Brian Christner bdf397bbe5 updated README with Security section and production security considerations 2017-08-08 11:52:11 +02:00
Brian Christner 4caab3eb9b Merge pull request #49 from wfhu/version-2
New grafana template with service filter
2017-08-08 11:12:28 +02:00
Brian Christner 95b05e0a3d Build image was using wrong branch
Fixed Travis build logo
2017-07-12 08:58:05 +02:00
Brian Christner 932ac65617 Update README.md 2017-07-12 08:56:02 +02:00
Brian Christner b48f9599d4 Fixed Travis build status 2017-07-12 08:54:50 +02:00
Brian Christner d3cffdc1dc fixed status 2017-06-21 21:49:07 +02:00
Brian Christner b1b9ae0488 added Travis status 2017-06-21 14:46:57 +02:00
Brian Christner aaacbf3309 added travis testing to this awesome project 2017-06-21 14:42:09 +02:00
Brian Christner 95332e35cb Merge pull request #39 from nikosch86/node-exporter-fix
fix node exporter usage/definition/parameters
2017-06-20 09:36:35 +02:00
Brian Christner 4d2cf49437 Merge pull request #35 from butlerx/bugfix/readme-format
Fix markdown formatting errors
2017-04-03 14:02:06 +02:00
Brian Christner 1a14f9c8b5 Merge pull request #34 from benclapp/extend-nodeexporter
Adding more machine metrics to Node-Exporter
2017-03-26 22:07:10 +02:00
Brian Christner 8bcc471b2b Merge pull request #26 from bamarni/patch-1
small typo
2016-11-27 20:31:30 +01:00
Brian Christner 97bdef76fc Merge pull request #25 from arun-gupta/couchbase
fixing some typos
2016-11-14 09:19:12 +01:00
Brian Christner da281b2e00 updated dashboard 2016-08-25 16:04:29 +02:00
Brian Christner 83ce3bb4ec Merge branch 'version-2' of https://github.com/vegasbrianc/prometheus into version-2 2016-08-25 15:55:32 +02:00
Brian Christner 9c1897bfc6 Update Grafana_Dashboard.json
Updated Dashboard. Split network graphs and fined tuned some other graphs
2016-08-22 16:26:38 +02:00
Brian Christner dc2a5d2d43 Updated time range to from: now-1h to now to fix no data issues 2016-08-03 07:34:09 +02:00
Brian Christner 36a7b4a871 Update README.md 2016-07-28 13:43:03 +02:00
Brian Christner 7cc1a49d9e Added Alert Manager address
Added Alert manager address
2016-07-28 13:39:10 +02:00
Brian Christner 75ec5a0d94 added System_Monitoring Dashboard for Grafana with Alerting metrics 2016-07-28 13:37:16 +02:00
Brian Christner 426fd8a848 Added alerting and Troubleshooting
Updated README with alerting section and troubleshooting
2016-07-28 13:36:03 +02:00
Brian Christner 1c0cc2611e created a dashboard directory and moved the dashboard.json files out of root 2016-07-28 13:04:49 +02:00
Brian Christner 00a44359f9 Merge pull request #13 from llitfkitfk/version-2
Add AlertManager
2016-07-28 10:16:19 +02: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
Brian Christner 1dc3279f5b Merge pull request #5 from kumy/patch-1
Fix typo in README
2016-06-30 08:59:57 +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
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
Brian Christner ef99e8df38 Added PromDash server config screenshot 2015-08-19 11:04:54 +02:00
Brian Christner 2ff42e5450 Update README.md 2015-08-19 11:02:44 +02:00
Brian Christner 6b82b3cada Update README.md 2015-08-19 11:02:25 +02:00
Brian Christner 8b19b72548 Update README.md
Added installation and config instructions
2015-08-19 10:58:48 +02:00
root a6c1d35682 updated README 2015-08-18 23:36:06 +02:00
root 04f35b62d0 added prometheus.yml config file. Kinda important 2015-08-18 23:29:25 +02:00
root eaca8b49d0 finally fixed the compose file. Changed the Dockerfile to pull the Prometheus image then inject the yml config changes 2015-08-18 23:28:12 +02:00
root dc8f124b58 still broke 2015-08-18 16:58:23 +02:00
root df0a31125e updated compose file fixing some bugs 2015-08-18 15:40:02 +02:00
Brian Christner 988c6c97c0 updated service names removing minus in compose and yml files 2015-08-18 14:40:38 +02:00
Brian Christner bf34f627cf created docker-prometheus compose file and edited the Prometheus yml file 2015-08-18 14:36:46 +02:00
Brian Christner 4b9b5b70e3 Prometheus commit 2015-08-18 13:37:24 +02:00