Merge pull request #79 from ernestas-poskus/bump/snmp_exporter_to_0_14_0

Bump snmp exporter to 0.14.0
ernestas-poskus · Dec 17, 2018 · 517e7c5 · 517e7c5
2 parents 7c460a0 + d620b2f
commit 517e7c5
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ prometheus_alert_manager_version: '0.15.3'
 prometheus_push_gateway_version: '0.7.0'
 
 # SNMP exporter
-prometheus_snmp_exporter_version: '0.13.0'
+prometheus_snmp_exporter_version: '0.14.0'
 
 # Blackbox exporter
 prometheus_blackbox_exporter_version: '0.13.0'

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -37,7 +37,7 @@ prometheus_alert_manager_version: '0.15.3'
 prometheus_push_gateway_version: '0.7.0'
 
 # SNMP exporter
-prometheus_snmp_exporter_version: '0.13.0'
+prometheus_snmp_exporter_version: '0.14.0'
 
 # Blackbox exporter
 prometheus_blackbox_exporter_version: '0.13.0'
@@ -421,6 +421,10 @@ prometheus_snmp_exporter_log__level: 'info'
 # Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"
 prometheus_snmp_exporter_log__format: 'logger:stderr'
 
+# SNMP exporter flags
+prometheus_snmp_exporter____enabled_flags: []
+#  - 'snmp.wrap-large-counters' # disabled by default
+
 # Blackbox exporter
 # https://github.com/prometheus/blackbox_exporter
 

diff --git a/docs/snmp_exporter.md b/docs/snmp_exporter.md
@@ -15,4 +15,8 @@ prometheus_snmp_exporter_log__level: 'info'
 
 # Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"
 prometheus_snmp_exporter_log__format: 'logger:stderr'
+
+# SNMP exporter flags
+prometheus_snmp_exporter____enabled_flags: []
+#  - 'snmp.wrap-large-counters' # disabled by default
 ```
diff --git a/files/snmp.yml b/files/snmp.yml
@@ -1,3 +1,4 @@
+# WARNING: This file was auto-generated using snmp_exporter generator, manual changes will be lost.
 apcups:
   walk:
   - 1.3.6.1.2.1.2
@@ -582,6 +583,11 @@ apcups:
     type: DisplayString
     help: The recommended replacement date for the battery based on the UPS internal
       battery life algorithm. - 1.3.6.1.4.1.318.1.1.1.2.2.21
+  - name: upsAdvBatteryNominalBackupTime
+    oid: 1.3.6.1.4.1.318.1.1.1.2.2.22
+    type: gauge
+    help: Defines the runtime of the user supplied battery in minutes, when battery
+      is new. - 1.3.6.1.4.1.318.1.1.1.2.2.22
   - name: upsHighPrecBatteryCapacity
     oid: 1.3.6.1.4.1.318.1.1.1.2.3.1
     type: gauge
@@ -1036,6 +1042,11 @@ apcups:
     oid: 1.3.6.1.4.1.318.1.1.1.4.2.12
     type: gauge
     help: The output energy usage of the UPS in kWh. - 1.3.6.1.4.1.318.1.1.1.4.2.12
+  - name: upsAdvOutputSourceSynchronization
+    oid: 1.3.6.1.4.1.318.1.1.1.4.2.13
+    type: gauge
+    help: Indicates the synchronization source for the inverter output frequency -
+      1.3.6.1.4.1.318.1.1.1.4.2.13
   - name: upsHighPrecOutputVoltage
     oid: 1.3.6.1.4.1.318.1.1.1.4.3.1
     type: gauge
@@ -1102,6 +1113,10 @@ apcups:
     oid: 1.3.6.1.4.1.318.1.1.1.7.2.9
     type: gauge
     help: The day of the week to perform automatic battery test. - 1.3.6.1.4.1.318.1.1.1.7.2.9
+  - name: upsAdvTestBatteryInterval
+    oid: 1.3.6.1.4.1.318.1.1.1.7.2.10
+    type: DisplayString
+    help: The UPS system's automatic battery test period. - 1.3.6.1.4.1.318.1.1.1.7.2.10
   - name: upsCommStatus
     oid: 1.3.6.1.4.1.318.1.1.1.8.1
     type: gauge
@@ -8296,6 +8311,32 @@ synology:
       labelname: raidName
       oid: 1.3.6.1.4.1.6574.3.1.1.2
       type: OctetString
+  - name: raidFreeSize
+    oid: 1.3.6.1.4.1.6574.3.1.1.4
+    type: counter
+    help: Synology raid freesize Free space in bytes. - 1.3.6.1.4.1.6574.3.1.1.4
+    indexes:
+    - labelname: raidName
+      type: gauge
+    lookups:
+    - labels:
+      - raidName
+      labelname: raidName
+      oid: 1.3.6.1.4.1.6574.3.1.1.2
+      type: OctetString
+  - name: raidTotalSize
+    oid: 1.3.6.1.4.1.6574.3.1.1.5
+    type: counter
+    help: Synology raid totalsize Total space in bytes. - 1.3.6.1.4.1.6574.3.1.1.5
+    indexes:
+    - labelname: raidName
+      type: gauge
+    lookups:
+    - labels:
+      - raidName
+      labelname: raidName
+      oid: 1.3.6.1.4.1.6574.3.1.1.2
+      type: OctetString
   - name: upsDeviceModel
     oid: 1.3.6.1.4.1.6574.4.1.1
     type: DisplayString
@@ -9372,6 +9413,27 @@ ubiquiti_airmax:
     indexes:
     - labelname: ubntAirMaxIfIndex
       type: gauge
+  - name: ubntAirMaxAirtime
+    oid: 1.3.6.1.4.1.41112.1.4.6.1.7
+    type: gauge
+    help: airMAX Airtime in % multiplied by 10 - 1.3.6.1.4.1.41112.1.4.6.1.7
+    indexes:
+    - labelname: ubntAirMaxIfIndex
+      type: gauge
+  - name: ubntAirMaxGpsSync
+    oid: 1.3.6.1.4.1.41112.1.4.6.1.8
+    type: gauge
+    help: airMAX GPS sync - on/off - 1.3.6.1.4.1.41112.1.4.6.1.8
+    indexes:
+    - labelname: ubntAirMaxIfIndex
+      type: gauge
+  - name: ubntAirMaxTdd
+    oid: 1.3.6.1.4.1.41112.1.4.6.1.9
+    type: gauge
+    help: airMAX TDD framing - on/off - 1.3.6.1.4.1.41112.1.4.6.1.9
+    indexes:
+    - labelname: ubntAirMaxIfIndex
+      type: gauge
   - name: ubntAirSyncIfIndex
     oid: 1.3.6.1.4.1.41112.1.4.3.1.1
     type: gauge
@@ -9759,6 +9821,42 @@ ubiquiti_airmax:
     oid: 1.3.6.1.4.1.41112.1.4.8.4
     type: gauge
     help: Host system temperature - 1.3.6.1.4.1.41112.1.4.8.4
+  - name: ubntGpsStatus
+    oid: 1.3.6.1.4.1.41112.1.4.9.1
+    type: gauge
+    help: GPS status - 1.3.6.1.4.1.41112.1.4.9.1
+  - name: ubntGpsFix
+    oid: 1.3.6.1.4.1.41112.1.4.9.2
+    type: gauge
+    help: GPS Fix Obtained - 1.3.6.1.4.1.41112.1.4.9.2
+  - name: ubntGpsLat
+    oid: 1.3.6.1.4.1.41112.1.4.9.3
+    type: DisplayString
+    help: GPS Latitude - 1.3.6.1.4.1.41112.1.4.9.3
+  - name: ubntGpsLon
+    oid: 1.3.6.1.4.1.41112.1.4.9.4
+    type: DisplayString
+    help: GPS Longitude - 1.3.6.1.4.1.41112.1.4.9.4
+  - name: ubntGpsAltMeters
+    oid: 1.3.6.1.4.1.41112.1.4.9.5
+    type: DisplayString
+    help: GPS Altitude (m) - 1.3.6.1.4.1.41112.1.4.9.5
+  - name: ubntGpsAltFeet
+    oid: 1.3.6.1.4.1.41112.1.4.9.6
+    type: DisplayString
+    help: GPS Altitude (ft) - 1.3.6.1.4.1.41112.1.4.9.6
+  - name: ubntGpsSatsVisible
+    oid: 1.3.6.1.4.1.41112.1.4.9.7
+    type: gauge
+    help: GPS Satellites Visible - 1.3.6.1.4.1.41112.1.4.9.7
+  - name: ubntGpsSatsTracked
+    oid: 1.3.6.1.4.1.41112.1.4.9.8
+    type: gauge
+    help: GPS Satellites Tracked - 1.3.6.1.4.1.41112.1.4.9.8
+  - name: ubntGpsHDOP
+    oid: 1.3.6.1.4.1.41112.1.4.9.9
+    type: DisplayString
+    help: GPS Horizontal Dilution of Precision - 1.3.6.1.4.1.41112.1.4.9.9
   version: 1
 ubiquiti_unifi:
   walk:

diff --git a/templates/snmp_exporter.service.j2 b/templates/snmp_exporter.service.j2
@@ -6,7 +6,7 @@ After=network.target
 Wants=network.target
 
 [Service]
-ExecStart={{ prometheus_install_dir }}/{{ prometheus_snmp_exporter_archive }}/snmp_exporter {% for config in prometheus_snmp_exporter_service_config if config[1] is not none %}--{{ config[0] }}={{ config[1] }} {% endfor %}
+ExecStart={{ prometheus_install_dir }}/{{ prometheus_snmp_exporter_archive }}/snmp_exporter {% for config in prometheus_snmp_exporter_service_config if config[1] is not none %}--{{ config[0] }}={{ config[1] }} {% endfor %} {% for enabled_bool in prometheus_snmp_exporter____enabled_flags %}--{{ enabled_bool }} {% endfor %}
 
 Restart=always
 RestartSec=20

diff --git a/vars/snmpexporter.yml b/vars/snmpexporter.yml
@@ -3,6 +3,6 @@
 ############################################################
 prometheus_snmp_exporter_service_config:
   - ['config.file', "{{ prometheus_snmp_exporter_config__file }}"]
-  - ['web.listen-address', "{{ prometheus_snmp_exporter_web__listen_address }}"]
-  - ['log.level', "{{ prometheus_snmp_exporter_log__level }}"]
   - ['log.format', "{{ prometheus_snmp_exporter_log__format }}"]
+  - ['log.level', "{{ prometheus_snmp_exporter_log__level }}"]
+  - ['web.listen-address', "{{ prometheus_snmp_exporter_web__listen_address }}"]