Browse Source

Upgrade to EOLE 2.7.0

develop
William Petit 4 months ago
parent
commit
550f33e612
7 changed files with 22 additions and 13 deletions
  1. 2
    0
      .gitignore
  2. 2
    2
      Makefile
  3. 4
    5
      README.md
  4. BIN
      bin/mysqld_exporter
  5. 1
    1
      diagnose/70-prometheus-mysql-exporter
  6. 4
    4
      dicos/72_mysql_exporter.xml
  7. 9
    1
      eole-mysql-exporter.mk

+ 2
- 0
.gitignore View File

@@ -0,0 +1,2 @@
1
+/tmp
2
+/bin

+ 2
- 2
Makefile View File

@@ -4,8 +4,8 @@
4 4
 
5 5
 SOURCE=eole-mysql-exporter
6 6
 VERSION=0.1
7
-EOLE_VERSION=2.5
8
-EOLE_RELEASE=2.5.2
7
+EOLE_VERSION=2.7
8
+EOLE_RELEASE=2.7.0
9 9
 PKGAPPS=non
10 10
 
11 11
 ################################

+ 4
- 5
README.md View File

@@ -1,9 +1,8 @@
1
-## eole-mysql-exporter
2
-Eolisation de la sonde de surveillance Prometheus mysql.
3
-
1
+# eole-mysql-exporter
4 2
 
5
-### Installation de la sonde eole-mysql-exporter :
3
+Eolisation de la sonde de surveillance Prometheus mysql.
6 4
 
5
+## Installation de la sonde eole-mysql-exporter :
7 6
 
8 7
 1. gen_config
9 8
 
@@ -11,7 +10,7 @@ Eolisation de la sonde de surveillance Prometheus mysql.
11 10
 Mode expert > Dépot tiers > Ajouter un dépot
12 11
         Cadoles pour environnement de Qualification
13 12
             Libellé du dépot = Cadoles
14
-            Déclaration du dépôt = deb https://vulcain.cadoles.com 2.6.2-staging main
13
+            Déclaration du dépôt = deb https://vulcain.cadoles.com 2.7.0-dev main
15 14
             Méthode de récupération de la clé = URL de la clé
16 15
             URL de la clé = https://vulcain.cadoles.com/cadoles.gpg
17 16
 ```

BIN
bin/mysqld_exporter View File


+ 1
- 1
diagnose/70-prometheus-mysql-exporter View File

@@ -1,6 +1,6 @@
1 1
 #!/bin/bash
2 2
 
3
-if [ $(CreoleGet activerSndMysqlExporter) = "oui" ];then
3
+if [ $(CreoleGet activerSndMysqlExporter) = "oui" ]; then
4 4
     . /usr/lib/eole/diagnose.sh
5 5
 
6 6
     EchoGras "*** Sonde Mysql"

+ 4
- 4
dicos/72_mysql_exporter.xml View File

@@ -3,16 +3,16 @@
3 3
 	<files>
4 4
 		<file name='/etc/default/prometheus-mysql-exporter' source="prometheus-mysql-exporter.defaults" mkdir='True' rm='True'/>
5 5
 		<service servicelist='slMysqlExporter'>prometheus-mysql-exporter</service>
6
-		<service_access service='prometheus-mysql-expoter'>
6
+		<service_access service='slMysqlExporter'>
7 7
 			<port service_accesslist="saSndMySQL">9104</port>
8 8
 		</service_access>
9
-		<service_restriction service='prometheus-mysql-expoter'>
9
+		<service_restriction service='slMysqlExporter'>
10 10
 			<ip interface='auto' netmask='255.255.255.255' ip_type='SymLinkOption'>sndPrometheusServer</ip>
11 11
 		</service_restriction>
12 12
 	</files>
13 13
 	<variables>
14 14
 		<family name='services'>
15
-			<variable name='activerSndMysqlExpoter' type='oui/non' description="Activer la sonde de surveillance système">
15
+			<variable name='activerSndMysqlExporter' type='oui/non' description="Activer la sonde de surveillance système">
16 16
 				<value>oui</value>
17 17
 			</variable>
18 18
 		</family>
@@ -27,7 +27,7 @@
27 27
 		</family>
28 28
 	</variables>
29 29
 	<constraints>
30
-		<condition name='disabled_if_in' source='activerSndMysqlExpoter'>
30
+		<condition name='disabled_if_in' source='activerSndMysqlExporter'>
31 31
 			<param>non</param>
32 32
 			<target type='family'>sonde systeme</target>
33 33
 			<target type='servicelist'>slMysqlExporter</target>

+ 9
- 1
eole-mysql-exporter.mk View File

@@ -1,3 +1,11 @@
1 1
 upstart_DATA_DIR := $(DESTDIR)/etc/init
2
+MYSQL_EXPORTER_VERSION := 0.11.0
2 3
 
3
-
4
+download-exporter:
5
+	mkdir -p tmp
6
+	cd tmp && wget https://github.com/prometheus/mysqld_exporter/releases/download/v$(MYSQL_EXPORTER_VERSION)/mysqld_exporter-$(MYSQL_EXPORTER_VERSION).linux-amd64.tar.gz
7
+	cd tmp && wget https://github.com/prometheus/mysqld_exporter/releases/download/v$(MYSQL_EXPORTER_VERSION)/sha256sums.txt
8
+	cd tmp && sha256sum -c --ignore-missing sha256sums.txt
9
+	cd tmp && tar -xzf mysqld_exporter-$(MYSQL_EXPORTER_VERSION).linux-amd64.tar.gz
10
+	cp -f tmp/mysqld_exporter-$(MYSQL_EXPORTER_VERSION).linux-amd64/mysqld_exporter ./bin/mysqld_exporter
11
+	rm -rf tmp

Loading…
Cancel
Save