Compare commits

...

42 Commits

Author SHA1 Message Date
vfebvre e81ef1f4a2 Merge branch 'develop' into dist/eole/2.7.0/develop 2022-02-07 12:24:18 +01:00
vfebvre de1500ef95 correction syntaxe subroutes 2022-02-07 12:23:45 +01:00
vfebvre 60148bfee4 Merge branch 'develop' into dist/eole/2.7.0/develop 2022-02-07 11:17:43 +01:00
vfebvre c35d1f0416 fix mise en page configuration alertmanager 2022-02-07 11:17:10 +01:00
vfebvre 7ab5e2a787 Merge branch 'develop' into dist/eole/2.7.0/develop 2020-12-17 10:24:06 +01:00
vincent 708088dfa5 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-06-07 15:24:54 +02:00
wpetit 22ed331256 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-04-15 14:18:56 +02:00
wpetit f611a75c96 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 16:38:38 +01:00
wpetit f14d388e83 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 16:01:15 +01:00
wpetit ec0dd2f2ed Modification des droits en postinst 2019-03-08 15:31:03 +01:00
wpetit ddd8ea9521 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 15:21:47 +01:00
wpetit 8d7d4c8a3b Création du répertoire /var/lib/grafana/dashboards 2019-03-08 15:12:48 +01:00
wpetit e65c5511ce Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 15:02:58 +01:00
wpetit 5ba7738ee8 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 14:56:28 +01:00
wpetit 634a583365 Ajout d'un répertoire de définition des dashboards 2019-03-08 14:55:57 +01:00
wpetit d0e4c0b794 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 14:49:27 +01:00
wpetit 50f865a635 Ajout d'un répertoire de définition des dashboards 2019-03-08 14:49:15 +01:00
wpetit b2caec4f54 Merge branch 'develop' into dist/eole/2.7.0/develop 2019-03-08 13:39:09 +01:00
wpetit 2de2f9480b Merge branch 'dist/eole/2.6.2/master' into dist/eole/2.7.0/develop 2019-03-08 12:08:16 +01:00
wpetit 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
10 changed files with 81 additions and 8 deletions

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

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
7

11
debian/control vendored Normal file
View File

@ -0,0 +1,11 @@
Source: eole-prometheus
Section: web
Priority: optional
Maintainer: Cadoles <contact@cadoles.com>
Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.3
Package: eole-prometheus
Architecture: amd64
Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter, prometheus-alertmanager, curl
Description: Eolisation de Prometheus

44
debian/copyright vendored Normal file
View File

@ -0,0 +1,44 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: {PROJECT}
Source: {URL}
Files: *
Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
License: {UPSTREAM LICENSE}
Files: debian/*
Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
License: CeCILL-2
License: {UPSTREAM LICENSE}
{TEXT OF THE LICENSE}
License: CeCILL-2
This software is governed by the CeCILL-2 license under French law and
abiding by the rules of distribution of free software. You can use,
modify and or redistribute the software under the terms of the CeCILL-2
license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info";.
.
As a counterpart to the access to the source code and rights to copy,
modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited
liability.
.
In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software,
that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or
data to be ensured and, more generally, to use and operate it in the
same conditions as regards security.
.
The fact that you are presently reading this means that you have had
knowledge of the CeCILL-2 license and that you accept its terms.
.
On Eole systems, the complete text of the CeCILL-2 License can be found
in '/usr/share/common-licenses/CeCILL-2-en'.

1
debian/dirs vendored Normal file
View File

@ -0,0 +1 @@
/var/lib/grafana/dashboards

0
debian/eole-prometheus.install vendored Normal file
View File

7
debian/postinst vendored Normal file
View File

@ -0,0 +1,7 @@
#!/bin/bash
case "$1" in
configure)
chown grafana:grafana /var/lib/grafana/dashboards
;;
esac

8
debian/rules vendored Executable file
View File

@ -0,0 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
%:
dh $@

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

View File

@ -93,9 +93,9 @@ route:
continue: true
%if not %%is_empty('alSubRoute')
routes:
%for sroute in %%getVar('alSubRoute',[])
%if %%sroute == %%rt
routes:
- match:
%%{sroute.alSubRouteMatchSource}: %%{sroute.alSubRouteMatchValue}
receiver: %%sroute.alSubRouteMatchReceiver