Add dbus interfaces to entity-manager
This adds dbus endpoints to the entity manager to
export available configurations. For more information
see docs folder in this repository.
This also reformats the json records to make thresholds
1-d arrays.
Change-Id: Iae5b9aa2bf5017ce2a24ec6b149ccdbc2fe70202
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
old mode 100755
new mode 100644
index d69ebd7..a2fba07
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1,4 +1,8 @@
{
+ "manufacturer": "$BOARD_MANUFACTURER",
+ "model": "$BOARD_PRODUCT_NAME",
+ "part_number": "$CHASSIS_PART_NUMBER",
+ "serial_number": "$CHASSIS_SERIAL_NUMBER",
"exposes": [
{
"name": "1U System Fan connector 1",
@@ -119,32 +123,30 @@
"bus": 6,
"name": "BMC Temp",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 115
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 110
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 5
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 115
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 110
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 5
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0
+ }
],
"type": "TMP75"
},
@@ -153,32 +155,30 @@
"name": "Baseboard 12 Volt",
"scale_factor": 0.1124,
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 13.494
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 13.101
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 10.945
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 10.616
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 13.494
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 13.101
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 10.945
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 10.616
+ }
],
"type": "ADC"
},
@@ -205,32 +205,30 @@
"bus": 6,
"name": "Left Rear Temp",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 115
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 110
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 5
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 115
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 110
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 5
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0
+ }
],
"type": "TMP75"
},
@@ -238,32 +236,30 @@
"index": 4,
"name": "P0V83_LAN_AUX",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 0.901
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 0.875
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 0.786
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0.763
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 0.901
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 0.875
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 0.786
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0.763
+ }
],
"type": "ADC"
},
@@ -271,32 +267,30 @@
"index": 3,
"name": "P105_PCH_AUX",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.139
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.106
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 0.995
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0.966
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.139
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.106
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 0.995
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0.966
+ }
],
"type": "ADC"
},
@@ -305,32 +299,30 @@
"name": "P12V_AUX",
"scale_factor": 0.2717,
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 13.494
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 13.101
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 10.945
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 10.616
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 13.494
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 13.101
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 10.945
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 10.616
+ }
],
"type": "ADC"
},
@@ -339,32 +331,30 @@
"name": "P1V8_PCH",
"scale_factor": 0.7505,
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.961
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.904
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 1.699
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 1.648
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.961
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.904
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 1.699
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 1.648
+ }
],
"type": "ADC"
},
@@ -373,32 +363,30 @@
"name": "P3V3",
"scale_factor": 0.4107,
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 3.647
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 3.066
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 3.066
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 2.974
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 3.647
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 3.066
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 3.066
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 2.974
+ }
],
"type": "ADC"
},
@@ -407,32 +395,30 @@
"name": "P3VBAT",
"scale_factor": 0.3333,
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 3.296
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 3.263
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 2.457
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 2.138
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 3.296
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 3.263
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 2.457
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 2.138
+ }
],
"type": "ADC"
},
@@ -441,32 +427,30 @@
"name": "PVCCIN_CPU0",
"scale_factor": 0.7505,
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 2.151
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 2.088
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 1.418
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 1.376
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 2.151
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 2.088
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 1.418
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 1.376
+ }
],
"type": "ADC"
},
@@ -474,32 +458,30 @@
"index": 9,
"name": "PVCCIN_CPU1",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 2.151
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 2.088
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 1.418
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 1.376
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 2.151
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 2.088
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 1.418
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 1.376
+ }
],
"type": "ADC"
},
@@ -507,32 +489,30 @@
"index": 14,
"name": "PVCCIO_CPU0",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.19
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.155
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 0.752
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0.729
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.19
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.155
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 0.752
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0.729
+ }
],
"type": "ADC"
},
@@ -540,32 +520,30 @@
"index": 15,
"name": "PVCCIO_CPU1",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.19
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.155
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 0.752
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0.729
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.19
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.155
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 0.752
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0.729
+ }
],
"type": "ADC"
},
@@ -573,32 +551,30 @@
"index": 10,
"name": "PVDQ_ABC_CPU0",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.301
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.263
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 1.138
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 1.104
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.301
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.263
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 1.138
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 1.104
+ }
],
"type": "ADC"
},
@@ -606,32 +582,30 @@
"index": 12,
"name": "PVDQ_ABC_CPU1",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.301
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.263
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 1.138
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 1.104
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.301
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.263
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 1.138
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 1.104
+ }
],
"type": "ADC"
},
@@ -639,32 +613,30 @@
"index": 11,
"name": "PVDQ_DEF_CPU0",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.301
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.263
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 1.138
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 1.104
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.301
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.263
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 1.138
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 1.104
+ }
],
"type": "ADC"
},
@@ -672,32 +644,30 @@
"index": 13,
"name": "PVDQ_DEF_CPU1",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.301
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.263
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 1.138
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 1.104
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.301
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.263
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 1.138
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 1.104
+ }
],
"type": "ADC"
},
@@ -705,32 +675,30 @@
"index": 2,
"name": "PVNN_PCH_AUX",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 1.081
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 1.049
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 0.807
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0.783
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 1.081
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 1.049
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 0.807
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0.783
+ }
],
"type": "ADC"
},
@@ -740,32 +708,30 @@
"name": "Right Rear Board Temp",
"name1": "Right Rear TMP421 Internal Temp",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 115
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 110
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 5
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 115
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 110
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 5
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0
+ }
],
"type": "TMP421"
},
@@ -774,32 +740,30 @@
"bus": 6,
"name": "Voltage Regulator 1 Temp",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 115
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 110
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 5
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 115
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 110
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 5
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0
+ }
],
"type": "TMP75"
},
@@ -808,32 +772,30 @@
"bus": 6,
"name": "Voltage Regulator 2 Temp",
"thresholds": [
- [
- {
- "direction": "greater than",
- "name": "upper critical",
- "severity": 1,
- "value": 115
- },
- {
- "direction": "greater than",
- "name": "upper non critical",
- "severity": 0,
- "value": 110
- },
- {
- "direction": "less than",
- "name": "lower non critical",
- "severity": 0,
- "value": 5
- },
- {
- "direction": "less than",
- "name": "lower critical",
- "severity": 1,
- "value": 0
- }
- ]
+ {
+ "direction": "greater than",
+ "name": "upper critical",
+ "severity": 1,
+ "value": 115
+ },
+ {
+ "direction": "greater than",
+ "name": "upper non critical",
+ "severity": 0,
+ "value": 110
+ },
+ {
+ "direction": "less than",
+ "name": "lower non critical",
+ "severity": 0,
+ "value": 5
+ },
+ {
+ "direction": "less than",
+ "name": "lower critical",
+ "severity": 1,
+ "value": 0
+ }
],
"type": "TMP75"
},