Commit Graph

95 Commits

Author SHA1 Message Date
llitfkitfk 7b5657d006 update docker-compose.yml to support swarm mode 2017-08-11 17:53:45 +08: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
huwenfeng 11b315c7bd share -> export -> save to file
get the template by this method : share -> export -> save to file
2017-08-08 14:42:18 +08:00
huwenfeng 5dd8ed179b New grafana template with service filter
Add an improved grafana template with filter of docker service name.
2017-08-07 21:05:13 +08: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
Nikolaus 4a71bfb08b make bind mounts readonly, you don't want some node-exporter vulnerability lead to write access on your node
fix collector.sysfs mistakenly use /host/sysfs eventhough sysfs is mounted on /host/sys
fix ignored mountpoints to work with bind mounts
add ignored fs-types to not display a lot of useless NaN and 0 metrics for mounts related to docker
put CLI arguments for command parameter in one value definition, seems like a bug in docker compose, only the first element in an array of commands is used
2017-04-16 10:29:29 +04: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
Cian Butler 43eaea546c Fix markdown formatting errors 2017-04-01 12:14:44 +01: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
Ben Clapp cfc8d45b1d Adding volumes and commands to node-exporter
- Allows the collection of metrics from the host system
2017-03-01 20:49:36 +13:00
Brian Christner 8bcc471b2b Merge pull request #26 from bamarni/patch-1
small typo
2016-11-27 20:31:30 +01:00
Bilal Amarni 10f76307a1 small typo 2016-11-26 12:58:35 +01:00
Brian Christner 97bdef76fc Merge pull request #25 from arun-gupta/couchbase
fixing some typos
2016-11-14 09:19:12 +01:00
Arun Gupta c4fe0d8cb7 fixing some typos 2016-11-11 23:53:44 +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
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