Fix duplicate entity_ids in System Monitor (#12124)

* Fix duplicate entity_ids in System Monitor

This fix makes it so `_percent` is appended to the `entity_id` of the following 3 resources, in order to make the `entity_id` unique:
- disk_use_percent
- memory_use_percent
- swap_use_percent

* match entity_id to resource name

Match entity_id to resource name, to make resulting entity_id more predictable

* match entity_id to more resource names

match entity_id to more resource names

* Add unique_id property

* Revert "Add unique_id property"

This reverts commit c213ac360e0fa90ab1b9cfbd2161413f038a4ff1.
This commit is contained in:
David 2018-02-09 23:10:16 +01:00 committed by Paulus Schoutsen
parent 6174c1754b
commit 129d720d8e

View File

@ -24,27 +24,27 @@ CONF_ARG = 'arg'
SENSOR_TYPES = {
'disk_free': ['Disk free', 'GiB', 'mdi:harddisk'],
'disk_use': ['Disk used', 'GiB', 'mdi:harddisk'],
'disk_use_percent': ['Disk used', '%', 'mdi:harddisk'],
'disk_use': ['Disk use', 'GiB', 'mdi:harddisk'],
'disk_use_percent': ['Disk use (percent)', '%', 'mdi:harddisk'],
'ipv4_address': ['IPv4 address', '', 'mdi:server-network'],
'ipv6_address': ['IPv6 address', '', 'mdi:server-network'],
'last_boot': ['Last boot', '', 'mdi:clock'],
'load_15m': ['Average load (15m)', '', 'mdi:memory'],
'load_1m': ['Average load (1m)', '', 'mdi:memory'],
'load_5m': ['Average load (5m)', '', 'mdi:memory'],
'memory_free': ['RAM available', 'MiB', 'mdi:memory'],
'memory_use': ['RAM used', 'MiB', 'mdi:memory'],
'memory_use_percent': ['RAM used', '%', 'mdi:memory'],
'network_in': ['Received', 'MiB', 'mdi:server-network'],
'network_out': ['Sent', 'MiB', 'mdi:server-network'],
'packets_in': ['Packets received', ' ', 'mdi:server-network'],
'packets_out': ['Packets sent', ' ', 'mdi:server-network'],
'load_15m': ['Load (15m)', '', 'mdi:memory'],
'load_1m': ['Load (1m)', '', 'mdi:memory'],
'load_5m': ['Load (5m)', '', 'mdi:memory'],
'memory_free': ['Memory free', 'MiB', 'mdi:memory'],
'memory_use': ['Memory use', 'MiB', 'mdi:memory'],
'memory_use_percent': ['Memory use (percent)', '%', 'mdi:memory'],
'network_in': ['Network in', 'MiB', 'mdi:server-network'],
'network_out': ['Network out', 'MiB', 'mdi:server-network'],
'packets_in': ['Packets in', ' ', 'mdi:server-network'],
'packets_out': ['Packets out', ' ', 'mdi:server-network'],
'process': ['Process', ' ', 'mdi:memory'],
'processor_use': ['CPU used', '%', 'mdi:memory'],
'processor_use': ['Processor use', '%', 'mdi:memory'],
'since_last_boot': ['Since last boot', '', 'mdi:clock'],
'swap_free': ['Swap free', 'GiB', 'mdi:harddisk'],
'swap_use': ['Swap used', 'GiB', 'mdi:harddisk'],
'swap_use_percent': ['Swap used', '%', 'mdi:harddisk'],
'swap_use': ['Swap use', 'GiB', 'mdi:harddisk'],
'swap_use_percent': ['Swap use (percent)', '%', 'mdi:harddisk'],
}
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({