Cadoles/eole-prometheus
10
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Compare commits

base: Cadoles:pkg/stable/eole-2.7.0/1.0.0-3
Branches Tags
Cadoles:master Cadoles:dist/eole/2.7.0/develop Cadoles:develop Cadoles:ajout_regle Cadoles:dist/eole/2.7.0/unstable Cadoles:dist/mse/2.7.0/unstable Cadoles:unstable Cadoles:dist/eole/2.7.0/master Cadoles:dist/eole/2.6.2/master Cadoles:2.6.2/master
Cadoles:pkg/unstable/eole-2.7.0/0.0.1-41 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-40 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-39 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-38 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-38 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-37 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-36 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-35 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-34 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-33 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-32 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-31 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-30 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-29 Cadoles:pkg/stable/eole-2.7.0/1.0.0-4 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-28 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-27 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-26 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-25 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-24 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-23 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-22 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-21 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-20 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-19 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-18 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-17 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-16 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-15 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-14 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-13 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-12 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-11 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-10 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-9 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-8 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-7 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-6 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-5 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-4 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-3 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-2 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-1 Cadoles:pkg/dev/eole-2.7.0/0.0.1-19 Cadoles:pkg/dev/eole-2.7.0/0.0.1-18 Cadoles:pkg/dev/eole-2.7.0/0.0.1-17 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-0 Cadoles:pkg/dev/eole-2.7.0/0.0.1-16 Cadoles:pkg/stable/eole-2.7.0/1.0.0-3 Cadoles:pkg/dev/eole-2.7.0/0.0.1-15 Cadoles:pkg/stable/eole-2.7.0/1.0.0-2 Cadoles:pkg/dev/eole-2.7.0/0.0.1-14 Cadoles:pkg/stable/eole-2.7.0/1.0.0-1 Cadoles:pkg/dev/eole-2.7.0/0.0.1-13 Cadoles:pkg/stable/eole-2.7.0/1.0.0-0 Cadoles:pkg/dev/eole-2.7.0/0.0.1-12 Cadoles:pkg/dev/eole-2.7.0/0.0.1-11 Cadoles:pkg/dev/eole-2.7.0/0.0.1-10 Cadoles:pkg/dev/eole-2.7.0/0.0.1-9 Cadoles:pkg/dev/eole-2.7.0/0.0.1-8 Cadoles:pkg/dev/eole-2.7.0/0.0.1-7 Cadoles:pkg/dev/eole-2.7.0/0.0.1-6 Cadoles:pkg/dev/eole-2.7.0/0.0.1-5 Cadoles:pkg/dev/eole-2.7.0/0.0.1-4 Cadoles:pkg/dev/eole-2.7.0/0.0.1-3 Cadoles:pkg/dev/eole-2.7.0/0.0.1-2 Cadoles:pkg/dev/eole-2.7.0/0.0.1-1 Cadoles:pkg/dev/eole-2.7.0/0.0.1-0 Cadoles:pkg/staging/eole-2.6.2/1.0.1-12 Cadoles:pkg/stable/eole-2.6.2/0.0.1-0 Cadoles:pkg/staging/eole-2.6.2/1.0.1-11 Cadoles:pkg/dev/eole-2.6.2/0.0.1-1 Cadoles:pkg/staging/eole-2.6.2/1.0.1-10 Cadoles:pkg/staging/eole-2.6.2/1.0.1-9 Cadoles:pkg/staging/eole-2.6.2/1.0.1-8 Cadoles:pkg/staging/eole-2.6.2/1.0.1-7 Cadoles:pkg/staging/eole-2.6.2/1.0.1-6 Cadoles:pkg/staging/eole-2.6.2/1.0.1-5 Cadoles:pkg/staging/eole-2.6.2/1.0.1-4 Cadoles:pkg/staging/eole-2.6.2/1.0.1-3 Cadoles:pkg/staging/eole-2.6.2/1.0.1-2 Cadoles:pkg/staging/eole-2.6.2/1.0.1-1 Cadoles:pkg/staging/eole-2.6.2/1.0.1-0 Cadoles:pkg/staging/eole-2.6.2/1.0.0-10 Cadoles:pkg/staging/eole-2.6.2/1.0.0-9 Cadoles:pkg/staging/eole-2.6.2/1.0.0-8 Cadoles:pkg/staging/eole-2.6.2/1.0.0-7 Cadoles:pkg/staging/eole-2.6.2/1.0.0-6 Cadoles:pkg/staging/eole-2.6.2/1.0.0-5 Cadoles:pkg/staging/eole-2.6.2/1.0.0-4 Cadoles:pkg/staging/eole-2.6.2/1.0.0-3 Cadoles:pkg/staging/eole-2.6.2/1.0.0-2 Cadoles:pkg/staging/eole-2.6.2/1.0.0-1 Cadoles:pkg/staging/eole-2.6.2/1.0.0-0 Cadoles:pkg/dev/eole-2.6.2/0.0.1-0 Cadoles:pkg/dev/2.6.2-0.0.1-0/0.0.1-0
..
compare: Cadoles:pkg/dev/eole-2.7.0/0.0.1-14
Branches Tags
Cadoles:master Cadoles:dist/eole/2.7.0/develop Cadoles:develop Cadoles:ajout_regle Cadoles:dist/eole/2.7.0/unstable Cadoles:dist/mse/2.7.0/unstable Cadoles:unstable Cadoles:dist/eole/2.7.0/master Cadoles:dist/eole/2.6.2/master Cadoles:2.6.2/master
Cadoles:pkg/unstable/eole-2.7.0/0.0.1-41 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-40 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-39 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-38 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-38 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-37 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-36 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-35 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-34 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-33 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-32 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-31 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-30 Cadoles:pkg/unstable/mse-2.7.0/0.0.1-29 Cadoles:pkg/stable/eole-2.7.0/1.0.0-4 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-28 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-27 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-26 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-25 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-24 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-23 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-22 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-21 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-20 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-19 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-18 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-17 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-16 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-15 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-14 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-13 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-12 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-11 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-10 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-9 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-8 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-7 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-6 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-5 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-4 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-3 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-2 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-1 Cadoles:pkg/dev/eole-2.7.0/0.0.1-19 Cadoles:pkg/dev/eole-2.7.0/0.0.1-18 Cadoles:pkg/dev/eole-2.7.0/0.0.1-17 Cadoles:pkg/unstable/eole-2.7.0/0.0.1-0 Cadoles:pkg/dev/eole-2.7.0/0.0.1-16 Cadoles:pkg/stable/eole-2.7.0/1.0.0-3 Cadoles:pkg/dev/eole-2.7.0/0.0.1-15 Cadoles:pkg/stable/eole-2.7.0/1.0.0-2 Cadoles:pkg/dev/eole-2.7.0/0.0.1-14 Cadoles:pkg/stable/eole-2.7.0/1.0.0-1 Cadoles:pkg/dev/eole-2.7.0/0.0.1-13 Cadoles:pkg/stable/eole-2.7.0/1.0.0-0 Cadoles:pkg/dev/eole-2.7.0/0.0.1-12 Cadoles:pkg/dev/eole-2.7.0/0.0.1-11 Cadoles:pkg/dev/eole-2.7.0/0.0.1-10 Cadoles:pkg/dev/eole-2.7.0/0.0.1-9 Cadoles:pkg/dev/eole-2.7.0/0.0.1-8 Cadoles:pkg/dev/eole-2.7.0/0.0.1-7 Cadoles:pkg/dev/eole-2.7.0/0.0.1-6 Cadoles:pkg/dev/eole-2.7.0/0.0.1-5 Cadoles:pkg/dev/eole-2.7.0/0.0.1-4 Cadoles:pkg/dev/eole-2.7.0/0.0.1-3 Cadoles:pkg/dev/eole-2.7.0/0.0.1-2 Cadoles:pkg/dev/eole-2.7.0/0.0.1-1 Cadoles:pkg/dev/eole-2.7.0/0.0.1-0 Cadoles:pkg/staging/eole-2.6.2/1.0.1-12 Cadoles:pkg/stable/eole-2.6.2/0.0.1-0 Cadoles:pkg/staging/eole-2.6.2/1.0.1-11 Cadoles:pkg/dev/eole-2.6.2/0.0.1-1 Cadoles:pkg/staging/eole-2.6.2/1.0.1-10 Cadoles:pkg/staging/eole-2.6.2/1.0.1-9 Cadoles:pkg/staging/eole-2.6.2/1.0.1-8 Cadoles:pkg/staging/eole-2.6.2/1.0.1-7 Cadoles:pkg/staging/eole-2.6.2/1.0.1-6 Cadoles:pkg/staging/eole-2.6.2/1.0.1-5 Cadoles:pkg/staging/eole-2.6.2/1.0.1-4 Cadoles:pkg/staging/eole-2.6.2/1.0.1-3 Cadoles:pkg/staging/eole-2.6.2/1.0.1-2 Cadoles:pkg/staging/eole-2.6.2/1.0.1-1 Cadoles:pkg/staging/eole-2.6.2/1.0.1-0 Cadoles:pkg/staging/eole-2.6.2/1.0.0-10 Cadoles:pkg/staging/eole-2.6.2/1.0.0-9 Cadoles:pkg/staging/eole-2.6.2/1.0.0-8 Cadoles:pkg/staging/eole-2.6.2/1.0.0-7 Cadoles:pkg/staging/eole-2.6.2/1.0.0-6 Cadoles:pkg/staging/eole-2.6.2/1.0.0-5 Cadoles:pkg/staging/eole-2.6.2/1.0.0-4 Cadoles:pkg/staging/eole-2.6.2/1.0.0-3 Cadoles:pkg/staging/eole-2.6.2/1.0.0-2 Cadoles:pkg/staging/eole-2.6.2/1.0.0-1 Cadoles:pkg/staging/eole-2.6.2/1.0.0-0 Cadoles:pkg/dev/eole-2.6.2/0.0.1-0 Cadoles:pkg/dev/2.6.2-0.0.1-0/0.0.1-0

37 Commits
pkg/stable ... pkg/dev/eo

Author SHA1 Message Date
vincent
708088dfa5 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-06-07 15:24:54 +02:00
William Petit
22ed331256 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-04-15 14:18:56 +02:00
William Petit
f611a75c96 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 16:38:38 +01:00
William Petit
f14d388e83 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 16:01:15 +01:00
William Petit
ec0dd2f2ed Modification des droits en postinst 2019-03-08 15:31:03 +01:00
William Petit
ddd8ea9521 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 15:21:47 +01:00
William Petit
8d7d4c8a3b Création du répertoire /var/lib/grafana/dashboards 2019-03-08 15:12:48 +01:00
William Petit
e65c5511ce Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 15:02:58 +01:00
William Petit
5ba7738ee8 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 14:56:28 +01:00
William Petit
634a583365 Ajout d'un répertoire de définition des dashboards 2019-03-08 14:55:57 +01:00
William Petit
d0e4c0b794 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 14:49:27 +01:00
William Petit
50f865a635 Ajout d'un répertoire de définition des dashboards 2019-03-08 14:49:15 +01:00
William Petit
b2caec4f54 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 13:39:09 +01:00
William Petit
2de2f9480b Merge branch 'dist/eole/2.6.2/master' into dist/eole/2.7.0/develop 2019-03-08 12:08:16 +01:00
William Petit
eb7b7e48df Merge branch 'master' into dist/eole/2.6.2/master 2018-06-25 11:08:09 +02:00
Philippe Caseiro
a5347e4168 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-19 17:41:34 +02:00
Philippe Caseiro
ee26997348 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-19 17:35:10 +02:00
Philippe Caseiro
7f9d0d252d Merge branch 'master' into dist/eole/2.6.2/master 2018-06-13 10:40:22 +02:00
Philippe Caseiro
16da5b91fa Merge branch 'master' into dist/eole/2.6.2/master 2018-06-13 10:35:02 +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
37d0dee412 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-11 09:36:47 +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
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
d5fe43fc05 Merge branch 'master' into dist/eole/2.6.2/master 2018-06-06 09:26:34 +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
fb6ee11d7a Merge branch 'master' into dist/eole/2.6.2/master 2018-06-05 17:18:54 +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
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
vincent
290231b394 Merge branch 'master' into dist/eole/2.6.2/master 2018-05-25 17:24:38 +02:00
vincent
4c6d88bae2 Merge branch 'master' into dist/eole/2.6.2/master 2018-05-25 16:01:35 +02:00
vincent
0a656de9e6 oubli du dossier debian ... 2018-05-25 15:56:49 +02:00
vincent
d1e5392a9a paquet debian 2018-05-25 13:32:18 +02:00
2 changed files with 2 additions and 5 deletions
Expand all files Collapse all files

4
Makefile
View File

@ -1,9 +1,9 @@
################################
# Makefile pour XXX-XXX
# Makefile pour eole-prometheus
################################
SOURCE=eole-prometheus
VERSION=0.1
VERSION=0.0.1
EOLE_VERSION=2.7
EOLE_RELEASE=2.7.0
PKGAPPS=non

3
tmpl/alertmanager.yml
View File

@ -81,7 +81,6 @@ route:
- match:
%%{sroute.alSubRouteMatchSource}: %%alSubRouteMatchValue
receiver: %%alSubRouteMatchReceiver
continue: true
%end if
%end for
%end if
@ -90,7 +89,6 @@ route:
- match:
%%{rt.alRouteMatchSource}: %%{rt.alRouteMatchValue}
receiver: %%rt.alRouteMatchReceiver
continue: true
%if not %%is_empty('alSubRoute')
routes:
@ -99,7 +97,6 @@ route:
- match:
%%{sroute.alSubRouteMatchSource}: %%{sroute.alSubRouteMatchValue}
receiver: %%sroute.alSubRouteMatchReceiver
continue: true
%end if
%end for
%end if