Commit Graph

70 Commits

Author SHA1 Message Date
Philippe Caseiro 16da5b91fa Merge branch 'master' into dist/eole/2.6.2/master 2018-06-13 10:35:02 +02:00
Philippe Caseiro 61155f10f4 Ajout de la possibilité de configurer la rétention des données 2018-06-13 10:33:25 +02:00
Philippe Caseiro 24332a98c8 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-11 15:45:40 +02:00
Philippe Caseiro a5b6333599 Fixing multiple jobs generation 2018-06-11 15:42:36 +02:00
Philippe Caseiro 37d0dee412 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-11 09:36:47 +02:00
Philippe Caseiro 37342e8700 Fix diagnose 2018-06-11 09:35:28 +02:00
Philippe Caseiro 33643232d4 Supporting gobal smtp gateway usage 2018-06-11 09:24:40 +02:00
Philippe Caseiro 1013775b1a Adding alert rules file template 2018-06-11 09:06:53 +02:00
Philippe Caseiro be23766fc2 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-06 16:47:31 +02:00
Philippe Caseiro e95d6f9e1d Improving dico to be more Prometheus like
We need to be closer to the prometheus way to do things
2018-06-06 16:46:02 +02:00
Philippe Caseiro ab479fd33a Improve configuration flexibility to match prometheus way of doing
things
2018-06-06 16:00:36 +02:00
Philippe Caseiro e3a6295709 Using 127.0.0.1 ... 2018-06-06 15:14:07 +02:00
Philippe Caseiro 1f6a18a14b We need curl 2018-06-06 14:45:27 +02:00
Philippe Caseiro c0b430ec2c Adding missing depend 2018-06-06 14:42:11 +02:00
Philippe Caseiro 39e1ed720d Merge branch 'master' into dist/eole/2.6.2/master 2018-06-06 14:39:46 +02:00
Philippe Caseiro ad56be504b Fix typo 2018-06-06 14:39:33 +02:00
Philippe Caseiro d5fe43fc05 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-06 09:26:34 +02:00
Philippe Caseiro 0fbffcc6d2 Adding some values for match sources 2018-06-06 09:26:21 +02:00
Philippe Caseiro d154fcd94e Merge branch 'master' into dist/eole/2.6.2/master 2018-06-06 09:11:03 +02:00
Philippe Caseiro 4195adfa6e Improving alerting configuration 2018-06-06 09:05:55 +02:00
Philippe Caseiro fb6ee11d7a Merge branch 'master' into dist/eole/2.6.2/master 2018-06-05 17:18:54 +02:00
Philippe Caseiro 5f263995d0 Fixing Variable order 2018-06-05 17:17:11 +02:00
Philippe Caseiro 73689be06c Fix bad variable name 2018-06-05 17:12:17 +02:00
Philippe Caseiro 9faff7988a Fix templateé 2018-06-05 17:07:34 +02:00
Philippe Caseiro 5ab3f20789 Improving alert support 2018-06-05 17:05:51 +02:00
Philippe Caseiro b95d0894d9 This as to be a multi to 2018-06-05 16:56:48 +02:00
Philippe Caseiro 44e3a5c0f7 Group master must be a multi 2018-06-05 16:55:45 +02:00
Philippe Caseiro 0d87cec74a true is not True 2018-06-05 16:55:03 +02:00
Philippe Caseiro 5c16310e5d Adding disable support for alert service 2018-06-05 16:53:11 +02:00
Philippe Caseiro c10edef336 Adding alertmanager support 2018-06-05 16:46:23 +02:00
Philippe Caseiro 0614d2863a Merge branch 'master' into dist/eole/2.6.2/master 2018-06-05 14:32:12 +02:00
Philippe Caseiro 598c1d1807 Fix template 2018-06-05 14:27:32 +02:00
Philippe Caseiro 2de724da57 Moving to bash 2 2018-06-05 11:45:05 +02:00
Philippe Caseiro a3def897fa Moving to bash 2018-06-04 17:01:42 +02:00
Philippe Caseiro 3df296b366 Adding datasource 2018-06-04 13:59:45 +02:00
Philippe Caseiro 4a24601bea Try 008 2018-06-04 11:16:18 +02:00
Philippe Caseiro f61a15d609 Try 007 2018-06-04 10:51:53 +02:00
Philippe Caseiro 4bd29eaa04 Try 006bis 2018-06-04 10:48:47 +02:00
Philippe Caseiro 3eaa7feee1 Try 006 2018-06-04 10:47:01 +02:00
Philippe Caseiro d815f156e3 Try 005 2018-06-04 10:42:19 +02:00
Philippe Caseiro 38883c4fca Try 004 2018-06-04 10:36:34 +02:00
Philippe Caseiro 325acbf537 Try 003 2018-06-04 10:33:36 +02:00
Philippe Caseiro f9be660423 Try 002 2018-06-04 10:30:13 +02:00
Philippe Caseiro 638295626b Try 001 2018-06-04 10:28:55 +02:00
Philippe Caseiro 0bfbcc71ab Adding debian depends 2018-06-01 11:41:59 +02:00
Philippe Caseiro cbf8d62cdc Merge branch 'dist/eole/2.6.2/master' of https://forge.cadoles.com/Cadoles/eole-prometheus into dist/eole/2.6.2/master 2018-06-01 11:32:05 +02:00
Philippe Caseiro 2af543c34e Revert "Adding debian packaging files"
This reverts commit 2da03082ec.
2018-06-01 11:32:00 +02:00
Philippe Caseiro 2da03082ec Adding debian packaging files 2018-06-01 11:30:56 +02:00
Philippe Caseiro a3e5e643e0 We don't want this ...
this prevent you to enable prometheus server in Amon module
2018-06-01 11:28:12 +02:00
Philippe Caseiro 5d9cd97de0 Removing NodeExporter management, this moves to eole-node-exporter 2018-06-01 11:27:07 +02:00