Merge branch 'nantes-cooling' into 'master'

[Nantes] add cooling system metrics

See merge request !1165

data/grid5000/sites/nantes/pdus/cooling-Z1.json

+{
+  "ip": "192.168.1.17",
+  "mac": "00:c0:b7:f5:fa:63",
+  "metrics": [
+    {
+      "description": "Temperature in input of cooling system, in tenths of degrees Celsius",
+      "name": "cooling_input_temperature_tenth_celsius",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature in output of cooling system, in tenths of degrees Celsius",
+      "name": "cooling_output_temperature_tenth_celsius",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Power consumption of cooling system, in tenths of kilowatt",
+      "name": "cooling_power_watt",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
+      "name": "pdu_temperature_tenth_celsius",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%",
+        "protocol": "snmp"
+      }
+    }
+  ],
+  "model": "ACRD602",
+  "ports": {
+    "31": "pdu-Z1.20",
+    "33": "pdu-Z1.40",
+    "35": "pdu-Z1.50"
+  },
+  "type": "pdu",
+  "uid": "cooling-Z1",
+  "vendor": "APC"
+}
\ No newline at end of file

data/grid5000/sites/nantes/pdus/pdu-Z1.10.json

@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-44",
     "11": "ecotype-45",

data/grid5000/sites/nantes/pdus/pdu-Z1.11.json

@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "electrical_mgmt_board",
     "10": "ecotype-44",

data/grid5000/sites/nantes/pdus/pdu-Z1.20.json

@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-32",
     "11": "ecotype-33",

data/grid5000/sites/nantes/pdus/pdu-Z1.21.json

@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "ecotype-prod2",
     "10": "ecotype-32",

data/grid5000/sites/nantes/pdus/pdu-Z1.40.json

@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "sw-ecotype-adm",
     "10": "ecotype-20",

data/grid5000/sites/nantes/pdus/pdu-Z1.41.json

@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-20",
     "11": "ecotype-21",

data/grid5000/sites/nantes/pdus/pdu-Z1.50.json

@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-8",
     "11": "ecotype-9",

data/grid5000/sites/nantes/pdus/pdu-Z1.51.json

@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "ecotype-prod2",
     "10": "ecotype-8",

input/grid5000/sites/nantes/pdus.yaml

@@ -2,7 +2,7 @@
 pdus:
   pdu-Z1.10:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -28,7 +28,7 @@ pdus:
 
   pdu-Z1.11:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -37,7 +37,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -61,7 +61,7 @@ pdus:
 
   pdu-Z1.20:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -87,7 +87,7 @@ pdus:
 
   pdu-Z1.21:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -96,7 +96,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -119,7 +119,7 @@ pdus:
       14: ecotype-36
   pdu-Z1.40:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -146,7 +146,7 @@ pdus:
 
   pdu-Z1.41:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -155,7 +155,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -178,7 +178,7 @@ pdus:
 
   pdu-Z1.50:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -204,7 +204,7 @@ pdus:
 
   pdu-Z1.51:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -213,7 +213,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -234,3 +234,38 @@ pdus:
       12: ecotype-10
       13: ecotype-11
       14: ecotype-12
+
+  cooling-Z1:
+    vendor: APC
+    model: 'ACRD602'
+    metrics:
+      - name: cooling_input_temperature_tenth_celsius
+        description: Temperature in input of cooling system, in tenths of degrees Celsius
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7
+      - name: cooling_output_temperature_tenth_celsius
+        description: Temperature in output of cooling system, in tenths of degrees Celsius
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9
+      - name: cooling_power_watt
+        description: Power consumption of cooling system, in tenths of kilowatt
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2
+      - name: pdu_temperature_tenth_celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%
+    ip: 192.168.1.17
+    mac: 00:c0:b7:f5:fa:63
+    ports:
+      31: pdu-Z1.20
+      33: pdu-Z1.40
+      35: pdu-Z1.50