diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
index e96d4db1f9020eab5c94d257db8ff1e0f452f931..a21efaf56e42b61734850daae3dda6f7fa9adf6b 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
@@ -62,19 +62,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 05-P1 PMM 1-8 reported by BMC, in celsius",
- "labels": {
- "id": "05-p1pmm1-8"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 6,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of Dimm 9-16 reported by BMC, in celsius",
"labels": {
@@ -88,19 +75,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 07-P1 PMM 9-16 reported by BMC, in celsius",
- "labels": {
- "id": "07-p1pmm9-16"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 8,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of Dimm 1-8 reported by BMC, in celsius",
"labels": {
@@ -114,19 +88,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 09-P2 PMM 1-8 reported by BMC, in celsius",
- "labels": {
- "id": "09-p2pmm1-8"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 10,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of Dimm 9-16 reported by BMC, in celsius",
"labels": {
@@ -140,19 +101,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 11-P2 PMM 9-16 reported by BMC, in celsius",
- "labels": {
- "id": "11-p2pmm9-16"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 12,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of 12-VR P1 reported by BMC, in celsius",
"labels": {
@@ -257,45 +205,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 20-HD Max reported by BMC, in celsius",
- "labels": {
- "id": "20-hdmax"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 21,
- "protocol": "ipmisensor"
- }
- },
- {
- "description": "Temperature of 21-Exp Bay Drive reported by BMC, in celsius",
- "labels": {
- "id": "21-expbaydrive"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 22,
- "protocol": "ipmisensor"
- }
- },
- {
- "description": "Temperature of 22-Stor Batt reported by BMC, in celsius",
- "labels": {
- "id": "22-storbatt"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 23,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of 23-E-Fuse reported by BMC, in celsius",
"labels": {
@@ -361,32 +270,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 30-HD Controller reported by BMC, in celsius",
- "labels": {
- "id": "30-hdcontroller"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 29,
- "protocol": "ipmisensor"
- }
- },
- {
- "description": "Temperature of 31-HD Cntlr Zone reported by BMC, in celsius",
- "labels": {
- "id": "31-hdcntlrzone"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 30,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of 32-Board Inlet reported by BMC, in celsius",
"labels": {
@@ -452,19 +335,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 37-PCI 1 reported by BMC, in celsius",
- "labels": {
- "id": "37-pci1"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 36,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of 38-PCI 1 Zone reported by BMC, in celsius",
"labels": {
@@ -478,19 +348,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 39-PCI 2 reported by BMC, in celsius",
- "labels": {
- "id": "39-pci2"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 38,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of 40-PCI 2 Zone reported by BMC, in celsius",
"labels": {
@@ -504,58 +361,6 @@
"protocol": "ipmisensor"
}
},
- {
- "description": "Temperature of 41-PCI 3 reported by BMC, in celsius",
- "labels": {
- "id": "41-pci3"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 40,
- "protocol": "ipmisensor"
- }
- },
- {
- "description": "Temperature of 42-PCI 3 Zone reported by BMC, in celsius",
- "labels": {
- "id": "42-pci3zone"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 41,
- "protocol": "ipmisensor"
- }
- },
- {
- "description": "Temperature of 43-ExpBayBoot reported by BMC, in celsius",
- "labels": {
- "id": "43-expbayboot"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 42,
- "protocol": "ipmisensor"
- }
- },
- {
- "description": "Temperature of 46-AHCI HD Max reported by BMC, in celsius",
- "labels": {
- "id": "46-ahcihdmax"
- },
- "name": "bmc_other_temp_celsius",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": 43,
- "protocol": "ipmisensor"
- }
- },
{
"description": "Temperature of Cpu 1 Pkg reported by BMC, in celsius",
"labels": {
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml
index 2dfa4ea65017e91d5123288976ea3274cfa4fdfa..5f37d46ab05eef2e2244483cca7f2c9e32e5fb3b 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml
@@ -64,15 +64,6 @@ metrics:
protocol: ipmisensor
id: 5 #04-P1 DIMM 1-8
- - name: bmc_other_temp_celsius
- labels: {"id": "05-p1pmm1-8"}
- description: Temperature of 05-P1 PMM 1-8 reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 6 #05-P1 PMM 1-8
-
- name: bmc_dimm_temp_celsius
labels: {"dimm": "9-16"}
description: Temperature of Dimm 9-16 reported by BMC, in celsius
@@ -82,15 +73,6 @@ metrics:
protocol: ipmisensor
id: 7 #06-P1 DIMM 9-16
- - name: bmc_other_temp_celsius
- labels: {"id": "07-p1pmm9-16"}
- description: Temperature of 07-P1 PMM 9-16 reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 8 #07-P1 PMM 9-16
-
- name: bmc_dimm_temp_celsius
labels: {"dimm": "1-8"}
description: Temperature of Dimm 1-8 reported by BMC, in celsius
@@ -100,15 +82,6 @@ metrics:
protocol: ipmisensor
id: 9 #08-P2 DIMM 1-8
- - name: bmc_other_temp_celsius
- labels: {"id": "09-p2pmm1-8"}
- description: Temperature of 09-P2 PMM 1-8 reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 10 #09-P2 PMM 1-8
-
- name: bmc_dimm_temp_celsius
labels: {"dimm": "9-16"}
description: Temperature of Dimm 9-16 reported by BMC, in celsius
@@ -118,15 +91,6 @@ metrics:
protocol: ipmisensor
id: 11 #10-P2 DIMM 9-16
- - name: bmc_other_temp_celsius
- labels: {"id": "11-p2pmm9-16"}
- description: Temperature of 11-P2 PMM 9-16 reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 12 #11-P2 PMM 9-16
-
- name: bmc_other_temp_celsius
labels: {"id": "12-vrp1"}
description: Temperature of 12-VR P1 reported by BMC, in celsius
@@ -199,33 +163,6 @@ metrics:
protocol: ipmisensor
id: 20 #19-BMC
- - name: bmc_other_temp_celsius
- labels: {"id": "20-hdmax"}
- description: Temperature of 20-HD Max reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 21 #20-HD Max
-
- - name: bmc_other_temp_celsius
- labels: {"id": "21-expbaydrive"}
- description: Temperature of 21-Exp Bay Drive reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 22 #21-Exp Bay Drive
-
- - name: bmc_other_temp_celsius
- labels: {"id": "22-storbatt"}
- description: Temperature of 22-Stor Batt reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 23 #22-Stor Batt
-
- name: bmc_other_temp_celsius
labels: {"id": "23-e-fuse"}
description: Temperature of 23-E-Fuse reported by BMC, in celsius
@@ -271,24 +208,6 @@ metrics:
protocol: ipmisensor
id: 28 #27-P/S 2 Inlet
- - name: bmc_other_temp_celsius
- labels: {"id": "30-hdcontroller"}
- description: Temperature of 30-HD Controller reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 29 #30-HD Controller
-
- - name: bmc_other_temp_celsius
- labels: {"id": "31-hdcntlrzone"}
- description: Temperature of 31-HD Cntlr Zone reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 30 #31-HD Cntlr Zone
-
- name: bmc_other_temp_celsius
labels: {"id": "32-boardinlet"}
description: Temperature of 32-Board Inlet reported by BMC, in celsius
@@ -334,15 +253,6 @@ metrics:
protocol: ipmisensor
id: 35 #36-Battery Zone
- - name: bmc_other_temp_celsius
- labels: {"id": "37-pci1"}
- description: Temperature of 37-PCI 1 reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 36 #37-PCI 1
-
- name: bmc_other_temp_celsius
labels: {"id": "38-pci1zone"}
description: Temperature of 38-PCI 1 Zone reported by BMC, in celsius
@@ -352,15 +262,6 @@ metrics:
protocol: ipmisensor
id: 37 #38-PCI 1 Zone
- - name: bmc_other_temp_celsius
- labels: {"id": "39-pci2"}
- description: Temperature of 39-PCI 2 reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 38 #39-PCI 2
-
- name: bmc_other_temp_celsius
labels: {"id": "40-pci2zone"}
description: Temperature of 40-PCI 2 Zone reported by BMC, in celsius
@@ -370,42 +271,6 @@ metrics:
protocol: ipmisensor
id: 39 #40-PCI 2 Zone
- - name: bmc_other_temp_celsius
- labels: {"id": "41-pci3"}
- description: Temperature of 41-PCI 3 reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 40 #41-PCI 3
-
- - name: bmc_other_temp_celsius
- labels: {"id": "42-pci3zone"}
- description: Temperature of 42-PCI 3 Zone reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 41 #42-PCI 3 Zone
-
- - name: bmc_other_temp_celsius
- labels: {"id": "43-expbayboot"}
- description: Temperature of 43-ExpBayBoot reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 42 #43-ExpBayBoot
-
- - name: bmc_other_temp_celsius
- labels: {"id": "46-ahcihdmax"}
- description: Temperature of 46-AHCI HD Max reported by BMC, in celsius
- period: 0
- optional_period: 5000
- source:
- protocol: ipmisensor
- id: 43 #46-AHCI HD Max
-
- name: bmc_cpu_temp_celsius
labels: {"cpu": "1pkg"}
description: Temperature of Cpu 1 Pkg reported by BMC, in celsius