From e152c68030fa229113df256d942acf85dab05beb Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Mon, 29 Mar 2021 15:28:20 +0200
Subject: [PATCH] Update Dockerfile for Go 1.16

Use go install to build the generator.
* Update snmp.yml with latest MIBs.

Fixes: https://github.com/prometheus/snmp_exporter/issues/635

Signed-off-by: Ben Kochie <superq@gmail.com>
---
 generator/Dockerfile |  5 +----
 snmp.yml             | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/generator/Dockerfile b/generator/Dockerfile
index 81c016f6..4170a113 100644
--- a/generator/Dockerfile
+++ b/generator/Dockerfile
@@ -2,10 +2,7 @@ FROM golang:latest
 
 RUN apt-get update && \
     apt-get install -y libsnmp-dev p7zip-full unzip && \
-    go get github.com/prometheus/snmp_exporter/generator && \
-    cd /go/src/github.com/prometheus/snmp_exporter/generator && \
-    go get -v . && \
-    go install
+    go install github.com/prometheus/snmp_exporter/generator@latest
 
 WORKDIR "/opt"
 
diff --git a/snmp.yml b/snmp.yml
index 61e33534..4f854854 100644
--- a/snmp.yml
+++ b/snmp.yml
@@ -25195,6 +25195,10 @@ synology:
     type: gauge
     help: This oid is for checking whether there is a latest DSM can be upgraded -
       1.3.6.1.4.1.6574.1.5.4
+  - name: controllerNumber
+    oid: 1.3.6.1.4.1.6574.1.6
+    type: gauge
+    help: Synology system controller number Controller A(0) Controller B(1) - 1.3.6.1.4.1.6574.1.6
   - name: storageIOIndex
     oid: 1.3.6.1.4.1.6574.101.1.1.1
     type: gauge
@@ -25375,6 +25379,21 @@ synology:
       type: DisplayString
     - labels: []
       labelname: storageIOIndex
+  - name: storageIODeviceSerial
+    oid: 1.3.6.1.4.1.6574.101.1.1.14
+    type: DisplayString
+    help: The name of the device we are counting/checking. - 1.3.6.1.4.1.6574.101.1.1.14
+    indexes:
+    - labelname: storageIOIndex
+      type: gauge
+    lookups:
+    - labels:
+      - storageIOIndex
+      labelname: storageIODevice
+      oid: 1.3.6.1.4.1.6574.101.1.1.2
+      type: DisplayString
+    - labels: []
+      labelname: storageIOIndex
   - name: spaceIOIndex
     oid: 1.3.6.1.4.1.6574.102.1.1.1
     type: gauge
@@ -25555,6 +25574,21 @@ synology:
       type: DisplayString
     - labels: []
       labelname: spaceIOIndex
+  - name: spaceUUID
+    oid: 1.3.6.1.4.1.6574.102.1.1.14
+    type: DisplayString
+    help: The uuid of space. - 1.3.6.1.4.1.6574.102.1.1.14
+    indexes:
+    - labelname: spaceIOIndex
+      type: gauge
+    lookups:
+    - labels:
+      - spaceIOIndex
+      labelname: spaceIODevice
+      oid: 1.3.6.1.4.1.6574.102.1.1.2
+      type: DisplayString
+    - labels: []
+      labelname: spaceIOIndex
   - name: iSCSILUNInfoIndex
     oid: 1.3.6.1.4.1.6574.104.1.1.1
     type: gauge