Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-virtual-sensor / 06f8874f26adff78f960c8937ce11b723ad31e87
commit06f8874f26adff78f960c8937ce11b723ad31e87[log] [tgz]
authorGeorge Liu <liuxiwei@ieisystem.com>Thu Oct 24 18:12:29 2024 +0800
committerGeorge Liu <liuxiwei@ieisystem.com>Fri Nov 01 10:09:02 2024 +0800
tree8ad6410e91a8c8ff2fafbc2b66f1d93d4c768c14
parentd98174e9c83d1eb585b58aa0c7c24e745b4a9688 [diff]
Fix create sensor failure after process restart

When the virtual-sensor process is intentionally restarted, the
createVirtualSensors method will only create sensors with Type equal
to ModifiedMedian, so if other types of sensors (eg: Sum, Minimum,
Maximum, etc.) are configured in EM.json, they will not be loaded.

This commit will remove the `Type` and create the sensor by
traversing the calculationIfaces when parsing to 'Config: D-Bus'.

Change-Id: I4a22bd2eef26e745e770acb260616374b5aba89b
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
2 files changed
tree: 8ad6410e91a8c8ff2fafbc2b66f1d93d4c768c14
  1. subprojects/
  2. test/
  3. .clang-format
  4. .editorconfig
  5. .gitignore
  6. .prettierrc.yaml
  7. calculate.cpp
  8. calculate.hpp
  9. dbusSensor.cpp
  10. dbusSensor.hpp
  11. dbusUtils.cpp
  12. dbusUtils.hpp
  13. exprtkTools.hpp
  14. LICENSE
  15. main.cpp
  16. meson.build
  17. meson.options
  18. OWNERS
  19. phosphor-virtual-sensor.service.in
  20. README.md
  21. thresholds.hpp
  22. virtual_sensor_config.json
  23. virtualSensor.cpp
  24. virtualSensor.hpp
README.md

phosphor-virtual-sensor

phosphor-virtual-sensor reads the configuration file virtual_sensor_config.json from one of three locations:

  1. The current directory.
  2. /var/lib/phosphor-virtual-sensor
  3. /usr/share/phosphor-virtual-sensor

By default the repository will install a sample config into (3).

There are two types of data in this file.

virtual sensor configuration information

See virtual_sensor_config.json in this repository for an example. Sensors added this way can use any expression that is accepted by exprtk.

information to get a virtual sensor configuration from D-Bus

For example:

{
  "Desc": {
    "Config": "D-Bus"
  }
}

Sensors added this way can only use a set of restricted calculations. Currently supported types are Average, Maximum, Minimum, Sum and ModifiedMedian.

The virtual sensor configuration information needs to be added into the relevant hardware configuration file in entity-manager. This method of adding a virtual sensor allows a recipe that builds for different hardware configurations to have different virtual sensors for each configuration.

The virtual sensor configuration in entity manager follows a different format to the JSON in virtual_sensor_config.json (specified in entity-manager/schemas/VirtualSensor.json).