Commit Graph

148 Commits

Author SHA1 Message Date
田浩 7b3ca393e7
Merge pull request #76 from llitfkitfk/version-2
add more ignored mount point
2017-11-17 08:51:24 +08:00
田浩 a628dec620
add more ignored mount point 2017-11-17 08:48:23 +08:00
田浩 571ec20212
Merge pull request #74 from llitfkitfk/version-2
Update node exporter ignored mount points
2017-11-14 12:33:43 +08:00
llitfkitfk 4b027be9fc add more node exporter ignored mount points 2017-11-14 12:27:56 +08:00
llitfkitfk 52be9f7567 update node exporter ignored mount points 2017-11-14 12:24:56 +08:00
田浩 8c8badfd74
Merge pull request #70 from eduponte/version-2
Update configs to Prometheus v2
2017-11-10 23:33:54 +08:00
田浩 79321b1df6
Merge branch 'version-2' into version-2 2017-11-10 23:03:23 +08:00
eduponte 76159c8b38 Configure alertmanager, the 2.0 way 2017-11-10 14:21:53 +01:00
eduponte 91389ccbf2 Rename alert.rules no .yml 2017-11-10 12:00:28 +01:00
eduponte 9a4536cec6 Remove .yml on rules 2017-11-10 11:56:16 +01:00
田浩 d7b3358268
Merge pull request #69 from llitfkitfk/version-2
Update prometheus to v2.0.0 & remove docker compose file 3.2 Volume LONG SYNTAX
2017-11-10 17:05:36 +08:00
llitfkitfk 806d49c002 update alert 2017-11-10 17:03:57 +08:00
llitfkitfk 35673af98d update prometheus to v2.0.0 2017-11-10 12:06:22 +08:00
eduponte 4cb6ecfd88 update configs to Prometheus v2 2017-11-08 17:17:13 +01:00
llitfkitfk 0fcf484433 remove docker compose file 3.2 Volume LONG SYNTAX 2017-11-03 16:40:00 +08:00
Brian Christner b699d0491a
Update README.md
Spelling fix
2017-11-02 14:42:34 +01:00
Brian Christner 83bc70cc76
1. updated README to default to using docker stack deploy instead of docker-compose
2. Removed deprecated expose from compose file
3. Bumped compose version to 3.2

Merge branch 'version-2' of github.com:vegasbrianc/prometheus into version-2

Signed-off-by: Brian Christner <brian.christner@gmail.com>
2017-10-18 21:19:00 +02:00
Brian Christner 07cf41bae6
updated docker-compose to be 100% compatible deploying to Swarm
Signed-off-by: Brian Christner <brian.christner@gmail.com>
2017-10-18 20:51:11 +02:00
Brian Christner 6f8db85035 Disabled node-exporter until it is fixed
Commented out the node-exporter until we figure out what is wrong with it as it doesn't perform the same across all OS platforms.
2017-10-18 07:42:03 +02:00
Brian Christner cd6a0350b3
removed host network from the compose
Signed-off-by: Brian Christner <brian.christner@gmail.com>
2017-10-17 21:34:21 +02:00
Brian Christner a84f475e33
last fix tonight 2017-10-15 23:50:52 +02:00
Brian Christner 32397ae82d
spelling mistakes 2017-10-15 23:43:46 +02:00
Brian Christner b311f15da2
updated security sections 2017-10-15 23:42:13 +02:00
Brian Christner f39de456af
more formatting 2017-10-15 23:39:41 +02:00
Brian Christner d869119fe6
more formatting 2017-10-15 23:35:29 +02:00
Brian Christner ce6904a495
fixed formatting of the index 2017-10-15 23:32:07 +02:00
Brian Christner fe6c9fa803
updated README for Mac Users and added a table of contents 2017-10-15 23:23:53 +02:00
Brian Christner abf7684761
fixed formatting of the node-exporter command and changed the network to host as recommend by docs 2017-10-12 06:42:49 +02:00
Brian Christner 26811c27b9
Merge branch 'yayitswei-patch-1' into version-2 2017-10-12 06:38:44 +02:00
Brian Christner 9b983d1064
Merge branch 'patch-1' of git://github.com/yayitswei/prometheus into yayitswei-patch-1 2017-10-12 06:38:32 +02:00
Brian Christner 6c23008635
Merge branch 'pengjia-version-2' into version-2 2017-10-12 06:36:17 +02:00
Brian Christner 8f903a43b1
Merge branch 'version-2' of https://github.com/pengjia/prometheus into pengjia-version-2 2017-10-12 06:35:39 +02:00
Wei Hsu 4d0f9ad25d Update nodeexporter deploy mode to global 2017-10-09 18:18:37 -07:00
Brian Christner b5634ff49b Created Contribution file 2017-10-09 21:39:00 +02:00
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
Peter 8e2a33aa7a FIX: correct the command to start the node-exporter service 2017-10-09 22:49:25 +08: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
Christian Hügel 544147dbf5 Update docker-compose.yml
expose /consoles in docker container
2017-09-10 17:59:30 +02:00
Leo Winter b7036aa48b Add auto restart to node-expolorer 2017-08-28 01:45:57 +02:00
Leo Winter 1647b230f0 Add auto restart 2017-08-28 01:43:02 +02:00
Brian Christner 4b4436a766 Merge pull request #52 from minac/patch-1
Update README
2017-08-17 12:44:34 +02:00
Miguel David 86f7ad8a0b Update README
Changed the Slack integration part according to their new interface. Fixed a typo. I hope this helps!
2017-08-17 11:40:16 +01:00
Brian Christner cb704e380b
Merge branch 'llitfkitfk-swarm-mode' into version-2
Merging the Swarm support
2017-08-17 09:57:21 +02:00