diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index 73e9c08..20ea1dc 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -383,90 +383,90 @@ node_entropy_available_bits 1337 node_exporter_build_info{branch="",goversion="go1.6.2",revision="",version=""} 1 # HELP node_exporter_scrape_duration_seconds node_exporter: Duration of a scrape job. # TYPE node_exporter_scrape_duration_seconds summary -node_exporter_scrape_duration_seconds{collector="bonding",result="success",quantile="0.5"} 0.00019123300000000002 -node_exporter_scrape_duration_seconds{collector="bonding",result="success",quantile="0.9"} 0.00019123300000000002 -node_exporter_scrape_duration_seconds{collector="bonding",result="success",quantile="0.99"} 0.00019123300000000002 -node_exporter_scrape_duration_seconds_sum{collector="bonding",result="success"} 0.00019123300000000002 +node_exporter_scrape_duration_seconds{collector="bonding",result="success",quantile="0.5"} 0.00016681900000000002 +node_exporter_scrape_duration_seconds{collector="bonding",result="success",quantile="0.9"} 0.00016681900000000002 +node_exporter_scrape_duration_seconds{collector="bonding",result="success",quantile="0.99"} 0.00016681900000000002 +node_exporter_scrape_duration_seconds_sum{collector="bonding",result="success"} 0.00016681900000000002 node_exporter_scrape_duration_seconds_count{collector="bonding",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="conntrack",result="success",quantile="0.5"} 3.1222e-05 -node_exporter_scrape_duration_seconds{collector="conntrack",result="success",quantile="0.9"} 3.1222e-05 -node_exporter_scrape_duration_seconds{collector="conntrack",result="success",quantile="0.99"} 3.1222e-05 -node_exporter_scrape_duration_seconds_sum{collector="conntrack",result="success"} 3.1222e-05 +node_exporter_scrape_duration_seconds{collector="conntrack",result="success",quantile="0.5"} 7.791e-05 +node_exporter_scrape_duration_seconds{collector="conntrack",result="success",quantile="0.9"} 7.791e-05 +node_exporter_scrape_duration_seconds{collector="conntrack",result="success",quantile="0.99"} 7.791e-05 +node_exporter_scrape_duration_seconds_sum{collector="conntrack",result="success"} 7.791e-05 node_exporter_scrape_duration_seconds_count{collector="conntrack",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="diskstats",result="success",quantile="0.5"} 0.001207839 -node_exporter_scrape_duration_seconds{collector="diskstats",result="success",quantile="0.9"} 0.001207839 -node_exporter_scrape_duration_seconds{collector="diskstats",result="success",quantile="0.99"} 0.001207839 -node_exporter_scrape_duration_seconds_sum{collector="diskstats",result="success"} 0.001207839 +node_exporter_scrape_duration_seconds{collector="diskstats",result="success",quantile="0.5"} 0.005133268000000001 +node_exporter_scrape_duration_seconds{collector="diskstats",result="success",quantile="0.9"} 0.005133268000000001 +node_exporter_scrape_duration_seconds{collector="diskstats",result="success",quantile="0.99"} 0.005133268000000001 +node_exporter_scrape_duration_seconds_sum{collector="diskstats",result="success"} 0.005133268000000001 node_exporter_scrape_duration_seconds_count{collector="diskstats",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="entropy",result="success",quantile="0.5"} 2.1329000000000002e-05 -node_exporter_scrape_duration_seconds{collector="entropy",result="success",quantile="0.9"} 2.1329000000000002e-05 -node_exporter_scrape_duration_seconds{collector="entropy",result="success",quantile="0.99"} 2.1329000000000002e-05 -node_exporter_scrape_duration_seconds_sum{collector="entropy",result="success"} 2.1329000000000002e-05 +node_exporter_scrape_duration_seconds{collector="entropy",result="success",quantile="0.5"} 0.000170072 +node_exporter_scrape_duration_seconds{collector="entropy",result="success",quantile="0.9"} 0.000170072 +node_exporter_scrape_duration_seconds{collector="entropy",result="success",quantile="0.99"} 0.000170072 +node_exporter_scrape_duration_seconds_sum{collector="entropy",result="success"} 0.000170072 node_exporter_scrape_duration_seconds_count{collector="entropy",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="filefd",result="success",quantile="0.5"} 3.7313e-05 -node_exporter_scrape_duration_seconds{collector="filefd",result="success",quantile="0.9"} 3.7313e-05 -node_exporter_scrape_duration_seconds{collector="filefd",result="success",quantile="0.99"} 3.7313e-05 -node_exporter_scrape_duration_seconds_sum{collector="filefd",result="success"} 3.7313e-05 +node_exporter_scrape_duration_seconds{collector="filefd",result="success",quantile="0.5"} 8.825900000000001e-05 +node_exporter_scrape_duration_seconds{collector="filefd",result="success",quantile="0.9"} 8.825900000000001e-05 +node_exporter_scrape_duration_seconds{collector="filefd",result="success",quantile="0.99"} 8.825900000000001e-05 +node_exporter_scrape_duration_seconds_sum{collector="filefd",result="success"} 8.825900000000001e-05 node_exporter_scrape_duration_seconds_count{collector="filefd",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="hwmon",result="success",quantile="0.5"} 0.002039698 -node_exporter_scrape_duration_seconds{collector="hwmon",result="success",quantile="0.9"} 0.002039698 -node_exporter_scrape_duration_seconds{collector="hwmon",result="success",quantile="0.99"} 0.002039698 -node_exporter_scrape_duration_seconds_sum{collector="hwmon",result="success"} 0.002039698 +node_exporter_scrape_duration_seconds{collector="hwmon",result="success",quantile="0.5"} 0.0076871280000000005 +node_exporter_scrape_duration_seconds{collector="hwmon",result="success",quantile="0.9"} 0.0076871280000000005 +node_exporter_scrape_duration_seconds{collector="hwmon",result="success",quantile="0.99"} 0.0076871280000000005 +node_exporter_scrape_duration_seconds_sum{collector="hwmon",result="success"} 0.0076871280000000005 node_exporter_scrape_duration_seconds_count{collector="hwmon",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="ksmd",result="success",quantile="0.5"} 9.497000000000001e-05 -node_exporter_scrape_duration_seconds{collector="ksmd",result="success",quantile="0.9"} 9.497000000000001e-05 -node_exporter_scrape_duration_seconds{collector="ksmd",result="success",quantile="0.99"} 9.497000000000001e-05 -node_exporter_scrape_duration_seconds_sum{collector="ksmd",result="success"} 9.497000000000001e-05 +node_exporter_scrape_duration_seconds{collector="ksmd",result="success",quantile="0.5"} 0.001088926 +node_exporter_scrape_duration_seconds{collector="ksmd",result="success",quantile="0.9"} 0.001088926 +node_exporter_scrape_duration_seconds{collector="ksmd",result="success",quantile="0.99"} 0.001088926 +node_exporter_scrape_duration_seconds_sum{collector="ksmd",result="success"} 0.001088926 node_exporter_scrape_duration_seconds_count{collector="ksmd",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="loadavg",result="success",quantile="0.5"} 0.00030610500000000004 -node_exporter_scrape_duration_seconds{collector="loadavg",result="success",quantile="0.9"} 0.00030610500000000004 -node_exporter_scrape_duration_seconds{collector="loadavg",result="success",quantile="0.99"} 0.00030610500000000004 -node_exporter_scrape_duration_seconds_sum{collector="loadavg",result="success"} 0.00030610500000000004 +node_exporter_scrape_duration_seconds{collector="loadavg",result="success",quantile="0.5"} 0.000189222 +node_exporter_scrape_duration_seconds{collector="loadavg",result="success",quantile="0.9"} 0.000189222 +node_exporter_scrape_duration_seconds{collector="loadavg",result="success",quantile="0.99"} 0.000189222 +node_exporter_scrape_duration_seconds_sum{collector="loadavg",result="success"} 0.000189222 node_exporter_scrape_duration_seconds_count{collector="loadavg",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="mdadm",result="success",quantile="0.5"} 0.001285081 -node_exporter_scrape_duration_seconds{collector="mdadm",result="success",quantile="0.9"} 0.001285081 -node_exporter_scrape_duration_seconds{collector="mdadm",result="success",quantile="0.99"} 0.001285081 -node_exporter_scrape_duration_seconds_sum{collector="mdadm",result="success"} 0.001285081 +node_exporter_scrape_duration_seconds{collector="mdadm",result="success",quantile="0.5"} 0.0030327270000000003 +node_exporter_scrape_duration_seconds{collector="mdadm",result="success",quantile="0.9"} 0.0030327270000000003 +node_exporter_scrape_duration_seconds{collector="mdadm",result="success",quantile="0.99"} 0.0030327270000000003 +node_exporter_scrape_duration_seconds_sum{collector="mdadm",result="success"} 0.0030327270000000003 node_exporter_scrape_duration_seconds_count{collector="mdadm",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="megacli",result="success",quantile="0.5"} 0.006589346 -node_exporter_scrape_duration_seconds{collector="megacli",result="success",quantile="0.9"} 0.006589346 -node_exporter_scrape_duration_seconds{collector="megacli",result="success",quantile="0.99"} 0.006589346 -node_exporter_scrape_duration_seconds_sum{collector="megacli",result="success"} 0.006589346 +node_exporter_scrape_duration_seconds{collector="megacli",result="success",quantile="0.5"} 0.010434629 +node_exporter_scrape_duration_seconds{collector="megacli",result="success",quantile="0.9"} 0.010434629 +node_exporter_scrape_duration_seconds{collector="megacli",result="success",quantile="0.99"} 0.010434629 +node_exporter_scrape_duration_seconds_sum{collector="megacli",result="success"} 0.010434629 node_exporter_scrape_duration_seconds_count{collector="megacli",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="meminfo",result="success",quantile="0.5"} 0.0025752360000000003 -node_exporter_scrape_duration_seconds{collector="meminfo",result="success",quantile="0.9"} 0.0025752360000000003 -node_exporter_scrape_duration_seconds{collector="meminfo",result="success",quantile="0.99"} 0.0025752360000000003 -node_exporter_scrape_duration_seconds_sum{collector="meminfo",result="success"} 0.0025752360000000003 +node_exporter_scrape_duration_seconds{collector="meminfo",result="success",quantile="0.5"} 0.000966604 +node_exporter_scrape_duration_seconds{collector="meminfo",result="success",quantile="0.9"} 0.000966604 +node_exporter_scrape_duration_seconds{collector="meminfo",result="success",quantile="0.99"} 0.000966604 +node_exporter_scrape_duration_seconds_sum{collector="meminfo",result="success"} 0.000966604 node_exporter_scrape_duration_seconds_count{collector="meminfo",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="meminfo_numa",result="success",quantile="0.5"} 0.000494111 -node_exporter_scrape_duration_seconds{collector="meminfo_numa",result="success",quantile="0.9"} 0.000494111 -node_exporter_scrape_duration_seconds{collector="meminfo_numa",result="success",quantile="0.99"} 0.000494111 -node_exporter_scrape_duration_seconds_sum{collector="meminfo_numa",result="success"} 0.000494111 +node_exporter_scrape_duration_seconds{collector="meminfo_numa",result="success",quantile="0.5"} 0.0017954980000000002 +node_exporter_scrape_duration_seconds{collector="meminfo_numa",result="success",quantile="0.9"} 0.0017954980000000002 +node_exporter_scrape_duration_seconds{collector="meminfo_numa",result="success",quantile="0.99"} 0.0017954980000000002 +node_exporter_scrape_duration_seconds_sum{collector="meminfo_numa",result="success"} 0.0017954980000000002 node_exporter_scrape_duration_seconds_count{collector="meminfo_numa",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="netdev",result="success",quantile="0.5"} 0.00038711700000000003 -node_exporter_scrape_duration_seconds{collector="netdev",result="success",quantile="0.9"} 0.00038711700000000003 -node_exporter_scrape_duration_seconds{collector="netdev",result="success",quantile="0.99"} 0.00038711700000000003 -node_exporter_scrape_duration_seconds_sum{collector="netdev",result="success"} 0.00038711700000000003 +node_exporter_scrape_duration_seconds{collector="netdev",result="success",quantile="0.5"} 0.000495389 +node_exporter_scrape_duration_seconds{collector="netdev",result="success",quantile="0.9"} 0.000495389 +node_exporter_scrape_duration_seconds{collector="netdev",result="success",quantile="0.99"} 0.000495389 +node_exporter_scrape_duration_seconds_sum{collector="netdev",result="success"} 0.000495389 node_exporter_scrape_duration_seconds_count{collector="netdev",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="netstat",result="success",quantile="0.5"} 0.0009007370000000001 -node_exporter_scrape_duration_seconds{collector="netstat",result="success",quantile="0.9"} 0.0009007370000000001 -node_exporter_scrape_duration_seconds{collector="netstat",result="success",quantile="0.99"} 0.0009007370000000001 -node_exporter_scrape_duration_seconds_sum{collector="netstat",result="success"} 0.0009007370000000001 +node_exporter_scrape_duration_seconds{collector="netstat",result="success",quantile="0.5"} 0.004669412 +node_exporter_scrape_duration_seconds{collector="netstat",result="success",quantile="0.9"} 0.004669412 +node_exporter_scrape_duration_seconds{collector="netstat",result="success",quantile="0.99"} 0.004669412 +node_exporter_scrape_duration_seconds_sum{collector="netstat",result="success"} 0.004669412 node_exporter_scrape_duration_seconds_count{collector="netstat",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="sockstat",result="success",quantile="0.5"} 0.000119957 -node_exporter_scrape_duration_seconds{collector="sockstat",result="success",quantile="0.9"} 0.000119957 -node_exporter_scrape_duration_seconds{collector="sockstat",result="success",quantile="0.99"} 0.000119957 -node_exporter_scrape_duration_seconds_sum{collector="sockstat",result="success"} 0.000119957 +node_exporter_scrape_duration_seconds{collector="sockstat",result="success",quantile="0.5"} 0.000185951 +node_exporter_scrape_duration_seconds{collector="sockstat",result="success",quantile="0.9"} 0.000185951 +node_exporter_scrape_duration_seconds{collector="sockstat",result="success",quantile="0.99"} 0.000185951 +node_exporter_scrape_duration_seconds_sum{collector="sockstat",result="success"} 0.000185951 node_exporter_scrape_duration_seconds_count{collector="sockstat",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="stat",result="success",quantile="0.5"} 0.00014981800000000002 -node_exporter_scrape_duration_seconds{collector="stat",result="success",quantile="0.9"} 0.00014981800000000002 -node_exporter_scrape_duration_seconds{collector="stat",result="success",quantile="0.99"} 0.00014981800000000002 -node_exporter_scrape_duration_seconds_sum{collector="stat",result="success"} 0.00014981800000000002 +node_exporter_scrape_duration_seconds{collector="stat",result="success",quantile="0.5"} 0.00029448200000000004 +node_exporter_scrape_duration_seconds{collector="stat",result="success",quantile="0.9"} 0.00029448200000000004 +node_exporter_scrape_duration_seconds{collector="stat",result="success",quantile="0.99"} 0.00029448200000000004 +node_exporter_scrape_duration_seconds_sum{collector="stat",result="success"} 0.00029448200000000004 node_exporter_scrape_duration_seconds_count{collector="stat",result="success"} 1 -node_exporter_scrape_duration_seconds{collector="textfile",result="success",quantile="0.5"} 3.0500000000000004e-07 -node_exporter_scrape_duration_seconds{collector="textfile",result="success",quantile="0.9"} 3.0500000000000004e-07 -node_exporter_scrape_duration_seconds{collector="textfile",result="success",quantile="0.99"} 3.0500000000000004e-07 -node_exporter_scrape_duration_seconds_sum{collector="textfile",result="success"} 3.0500000000000004e-07 +node_exporter_scrape_duration_seconds{collector="textfile",result="success",quantile="0.5"} 5.180000000000001e-07 +node_exporter_scrape_duration_seconds{collector="textfile",result="success",quantile="0.9"} 5.180000000000001e-07 +node_exporter_scrape_duration_seconds{collector="textfile",result="success",quantile="0.99"} 5.180000000000001e-07 +node_exporter_scrape_duration_seconds_sum{collector="textfile",result="success"} 5.180000000000001e-07 node_exporter_scrape_duration_seconds_count{collector="textfile",result="success"} 1 # HELP node_filefd_allocated File descriptor statistics: allocated. # TYPE node_filefd_allocated gauge @@ -485,29 +485,29 @@ node_hwmon_fan_alarm{chip="nct6779",sensor="fan2"} 0 node_hwmon_fan_beep_enabled{chip="nct6779",sensor="fan2"} 0 # HELP node_hwmon_fan_manual Hardware monitor fan element manual # TYPE node_hwmon_fan_manual gauge -node_hwmon_fan_manual{chip="applesmc_768",sensor="left_side"} 0 -node_hwmon_fan_manual{chip="applesmc_768",sensor="right_side"} 0 +node_hwmon_fan_manual{chip="platform_applesmc_768",sensor="left_side"} 0 +node_hwmon_fan_manual{chip="platform_applesmc_768",sensor="right_side"} 0 # HELP node_hwmon_fan_max_rpm Hardware monitor for fan revolutions per minute (max) # TYPE node_hwmon_fan_max_rpm gauge -node_hwmon_fan_max_rpm{chip="applesmc_768",sensor="left_side"} 6156 -node_hwmon_fan_max_rpm{chip="applesmc_768",sensor="right_side"} 5700 +node_hwmon_fan_max_rpm{chip="platform_applesmc_768",sensor="left_side"} 6156 +node_hwmon_fan_max_rpm{chip="platform_applesmc_768",sensor="right_side"} 5700 # HELP node_hwmon_fan_min_rpm Hardware monitor for fan revolutions per minute (min) # TYPE node_hwmon_fan_min_rpm gauge -node_hwmon_fan_min_rpm{chip="applesmc_768",sensor="left_side"} 2160 -node_hwmon_fan_min_rpm{chip="applesmc_768",sensor="right_side"} 2000 node_hwmon_fan_min_rpm{chip="nct6779",sensor="fan2"} 0 +node_hwmon_fan_min_rpm{chip="platform_applesmc_768",sensor="left_side"} 2160 +node_hwmon_fan_min_rpm{chip="platform_applesmc_768",sensor="right_side"} 2000 # HELP node_hwmon_fan_output Hardware monitor fan element output # TYPE node_hwmon_fan_output gauge -node_hwmon_fan_output{chip="applesmc_768",sensor="left_side"} 2160 -node_hwmon_fan_output{chip="applesmc_768",sensor="right_side"} 2000 +node_hwmon_fan_output{chip="platform_applesmc_768",sensor="left_side"} 2160 +node_hwmon_fan_output{chip="platform_applesmc_768",sensor="right_side"} 2000 # HELP node_hwmon_fan_pulses Hardware monitor fan element pulses # TYPE node_hwmon_fan_pulses gauge node_hwmon_fan_pulses{chip="nct6779",sensor="fan2"} 2 # HELP node_hwmon_fan_rpm Hardware monitor for fan revolutions per minute (input) # TYPE node_hwmon_fan_rpm gauge -node_hwmon_fan_rpm{chip="applesmc_768",sensor="left_side"} 0 -node_hwmon_fan_rpm{chip="applesmc_768",sensor="right_side"} 1998 node_hwmon_fan_rpm{chip="nct6779",sensor="fan2"} 1098 +node_hwmon_fan_rpm{chip="platform_applesmc_768",sensor="left_side"} 0 +node_hwmon_fan_rpm{chip="platform_applesmc_768",sensor="right_side"} 1998 # HELP node_hwmon_fan_target_rpm Hardware monitor for fan revolutions per minute (target) # TYPE node_hwmon_fan_target_rpm gauge node_hwmon_fan_target_rpm{chip="nct6779",sensor="fan2"} 27000 @@ -625,32 +625,52 @@ node_hwmon_pwm_weight_temp_step_base{chip="nct6779",sensor="pwm1"} 0 node_hwmon_pwm_weight_temp_step_tol{chip="nct6779",sensor="pwm1"} 0 # HELP node_hwmon_temp_celsius Hardware monitor for temperature (input) # TYPE node_hwmon_temp_celsius gauge -node_hwmon_temp_celsius{chip="coretemp",sensor="core_0"} 54 -node_hwmon_temp_celsius{chip="coretemp",sensor="core_1"} 52 -node_hwmon_temp_celsius{chip="coretemp",sensor="core_2"} 53 -node_hwmon_temp_celsius{chip="coretemp",sensor="core_3"} 50 -node_hwmon_temp_celsius{chip="coretemp",sensor="physical_id_0"} 55 +node_hwmon_temp_celsius{chip="platform_coretemp_0",sensor="core_0"} 54 +node_hwmon_temp_celsius{chip="platform_coretemp_0",sensor="core_1"} 52 +node_hwmon_temp_celsius{chip="platform_coretemp_0",sensor="core_2"} 53 +node_hwmon_temp_celsius{chip="platform_coretemp_0",sensor="core_3"} 50 +node_hwmon_temp_celsius{chip="platform_coretemp_0",sensor="physical_id_0"} 55 +node_hwmon_temp_celsius{chip="platform_coretemp_1",sensor="core_0"} 54 +node_hwmon_temp_celsius{chip="platform_coretemp_1",sensor="core_1"} 52 +node_hwmon_temp_celsius{chip="platform_coretemp_1",sensor="core_2"} 53 +node_hwmon_temp_celsius{chip="platform_coretemp_1",sensor="core_3"} 50 +node_hwmon_temp_celsius{chip="platform_coretemp_1",sensor="physical_id_0"} 55 # HELP node_hwmon_temp_crit_alarm_celsius Hardware monitor for temperature (crit_alarm) # TYPE node_hwmon_temp_crit_alarm_celsius gauge -node_hwmon_temp_crit_alarm_celsius{chip="coretemp",sensor="core_0"} 0 -node_hwmon_temp_crit_alarm_celsius{chip="coretemp",sensor="core_1"} 0 -node_hwmon_temp_crit_alarm_celsius{chip="coretemp",sensor="core_2"} 0 -node_hwmon_temp_crit_alarm_celsius{chip="coretemp",sensor="core_3"} 0 -node_hwmon_temp_crit_alarm_celsius{chip="coretemp",sensor="physical_id_0"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_0",sensor="core_0"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_0",sensor="core_1"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_0",sensor="core_2"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_0",sensor="core_3"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_0",sensor="physical_id_0"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_1",sensor="core_0"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_1",sensor="core_1"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_1",sensor="core_2"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_1",sensor="core_3"} 0 +node_hwmon_temp_crit_alarm_celsius{chip="platform_coretemp_1",sensor="physical_id_0"} 0 # HELP node_hwmon_temp_crit_celsius Hardware monitor for temperature (crit) # TYPE node_hwmon_temp_crit_celsius gauge -node_hwmon_temp_crit_celsius{chip="coretemp",sensor="core_0"} 100 -node_hwmon_temp_crit_celsius{chip="coretemp",sensor="core_1"} 100 -node_hwmon_temp_crit_celsius{chip="coretemp",sensor="core_2"} 100 -node_hwmon_temp_crit_celsius{chip="coretemp",sensor="core_3"} 100 -node_hwmon_temp_crit_celsius{chip="coretemp",sensor="physical_id_0"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_0",sensor="core_0"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_0",sensor="core_1"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_0",sensor="core_2"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_0",sensor="core_3"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_0",sensor="physical_id_0"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_1",sensor="core_0"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_1",sensor="core_1"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_1",sensor="core_2"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_1",sensor="core_3"} 100 +node_hwmon_temp_crit_celsius{chip="platform_coretemp_1",sensor="physical_id_0"} 100 # HELP node_hwmon_temp_max_celsius Hardware monitor for temperature (max) # TYPE node_hwmon_temp_max_celsius gauge -node_hwmon_temp_max_celsius{chip="coretemp",sensor="core_0"} 84 -node_hwmon_temp_max_celsius{chip="coretemp",sensor="core_1"} 84 -node_hwmon_temp_max_celsius{chip="coretemp",sensor="core_2"} 84 -node_hwmon_temp_max_celsius{chip="coretemp",sensor="core_3"} 84 -node_hwmon_temp_max_celsius{chip="coretemp",sensor="physical_id_0"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_0",sensor="core_0"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_0",sensor="core_1"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_0",sensor="core_2"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_0",sensor="core_3"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_0",sensor="physical_id_0"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_1",sensor="core_0"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_1",sensor="core_1"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_1",sensor="core_2"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_1",sensor="core_3"} 84 +node_hwmon_temp_max_celsius{chip="platform_coretemp_1",sensor="physical_id_0"} 84 # HELP node_intr Total number of interrupts serviced. # TYPE node_intr counter node_intr 8.885917e+06 diff --git a/collector/fixtures/sys/class/hwmon/hwmon1 b/collector/fixtures/sys/class/hwmon/hwmon1 index bfb5f22..6aa6f3a 120000 --- a/collector/fixtures/sys/class/hwmon/hwmon1 +++ b/collector/fixtures/sys/class/hwmon/hwmon1 @@ -1 +1 @@ -../../devices/platform/nct6775.656/hwmon/hwmon1 \ No newline at end of file +../../devices/platform/coretemp.1/hwmon/hwmon1 \ No newline at end of file diff --git a/collector/fixtures/sys/class/hwmon/hwmon3 b/collector/fixtures/sys/class/hwmon/hwmon3 new file mode 120000 index 0000000..edfd34c --- /dev/null +++ b/collector/fixtures/sys/class/hwmon/hwmon3 @@ -0,0 +1 @@ +../../devices/platform/nct6775.656/hwmon/hwmon3 \ No newline at end of file diff --git a/collector/fixtures/sys/devices/platform/coretemp.0/hwmon/hwmon0/device b/collector/fixtures/sys/devices/platform/coretemp.0/hwmon/hwmon0/device new file mode 120000 index 0000000..faf75ed --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.0/hwmon/hwmon0/device @@ -0,0 +1 @@ +../../../coretemp.0 \ No newline at end of file diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/device b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/device new file mode 120000 index 0000000..d493545 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/device @@ -0,0 +1 @@ +../../../coretemp.1 \ No newline at end of file diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/name b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/name new file mode 100644 index 0000000..77ce462 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/name @@ -0,0 +1 @@ +coretemp diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_crit b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_crit new file mode 100644 index 0000000..f7393e8 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_crit @@ -0,0 +1 @@ +100000 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_alarm b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_crit_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_alarm rename to collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_crit_alarm diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_input b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_input new file mode 100644 index 0000000..2ef4768 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_input @@ -0,0 +1 @@ +55000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_label b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_label new file mode 100644 index 0000000..f93d047 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_label @@ -0,0 +1 @@ +Physical id 0 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_max b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_max new file mode 100644 index 0000000..9c2ebf5 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp1_max @@ -0,0 +1 @@ +84000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_crit b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_crit new file mode 100644 index 0000000..f7393e8 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_crit @@ -0,0 +1 @@ +100000 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_beep b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_crit_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_beep rename to collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_crit_alarm diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_input b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_input new file mode 100644 index 0000000..627c5c7 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_input @@ -0,0 +1 @@ +54000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_label b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_label new file mode 100644 index 0000000..09f8cbd --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_label @@ -0,0 +1 @@ +Core 0 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_max b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_max new file mode 100644 index 0000000..9c2ebf5 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp2_max @@ -0,0 +1 @@ +84000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_crit b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_crit new file mode 100644 index 0000000..f7393e8 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_crit @@ -0,0 +1 @@ +100000 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_min b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_crit_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_min rename to collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_crit_alarm diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_input b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_input new file mode 100644 index 0000000..44a1fc2 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_input @@ -0,0 +1 @@ +52000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_label b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_label new file mode 100644 index 0000000..e98a1da --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_label @@ -0,0 +1 @@ +Core 1 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_max b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_max new file mode 100644 index 0000000..9c2ebf5 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp3_max @@ -0,0 +1 @@ +84000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_crit b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_crit new file mode 100644 index 0000000..f7393e8 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_crit @@ -0,0 +1 @@ +100000 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_tolerance b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_crit_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_tolerance rename to collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_crit_alarm diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_input b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_input new file mode 100644 index 0000000..7f13265 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_input @@ -0,0 +1 @@ +53000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_label b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_label new file mode 100644 index 0000000..18c8a0b --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_label @@ -0,0 +1 @@ +Core 2 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_max b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_max new file mode 100644 index 0000000..9c2ebf5 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp4_max @@ -0,0 +1 @@ +84000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_crit b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_crit new file mode 100644 index 0000000..f7393e8 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_crit @@ -0,0 +1 @@ +100000 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_alarm b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_crit_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_alarm rename to collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_crit_alarm diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_input b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_input new file mode 100644 index 0000000..ccfc37a --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_input @@ -0,0 +1 @@ +50000 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_label b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_label new file mode 100644 index 0000000..5ec08ee --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_label @@ -0,0 +1 @@ +Core 3 diff --git a/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_max b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_max new file mode 100644 index 0000000..9c2ebf5 --- /dev/null +++ b/collector/fixtures/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp5_max @@ -0,0 +1 @@ +84000 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_beep b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_beep rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_alarm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_min b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_beep similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_min rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_beep diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_input b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_input similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_input rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_input diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_beep b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_min similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_beep rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_min diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_pulses b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_pulses similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_pulses rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_pulses diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_target b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_target similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/fan2_target rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_target diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_max b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_tolerance similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_max rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/fan2_tolerance diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_min b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_min rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_alarm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion0_beep b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_beep similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion0_beep rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_beep diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_input b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_input similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_input rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_input diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_max b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_max similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in0_max rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_max diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion1_beep b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_min similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion1_beep rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in0_min diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_alarm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_alarm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_alarm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_target_temp b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_beep similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_target_temp rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_beep diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_input b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_input similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/in1_input rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_input diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_temp_tolerance b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_max similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_temp_tolerance rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_max diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_duty_base b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_min similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_duty_base rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/in1_min diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion0_alarm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion0_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion0_alarm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion0_alarm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_duty_step b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion0_beep similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_duty_step rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion0_beep diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion1_alarm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion1_alarm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/intrusion1_alarm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion1_alarm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_step b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion1_beep similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_step rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/intrusion1_beep diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/name b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/name similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/name rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/name diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point1_pwm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point1_pwm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point1_pwm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point1_pwm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point1_temp b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point1_temp similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point1_temp rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point1_temp diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point2_pwm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point2_pwm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point2_pwm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point2_pwm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point2_temp b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point2_temp similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point2_temp rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point2_temp diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point3_pwm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point3_pwm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point3_pwm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point3_pwm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point3_temp b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point3_temp similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point3_temp rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point3_temp diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point4_pwm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point4_pwm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point4_pwm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point4_pwm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point4_temp b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point4_temp similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point4_temp rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point4_temp diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point5_pwm b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point5_pwm similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point5_pwm rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point5_pwm diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point5_temp b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point5_temp similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_auto_point5_temp rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_auto_point5_temp diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_crit_temp_tolerance b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_crit_temp_tolerance similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_crit_temp_tolerance rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_crit_temp_tolerance diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_enable b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_enable similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_enable rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_enable diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_floor b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_floor similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_floor rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_floor diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_mode b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_mode similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_mode rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_mode diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_start b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_start similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_start rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_start diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_step_down_time b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_step_down_time similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_step_down_time rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_step_down_time diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_step_up_time b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_step_up_time similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_step_up_time rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_step_up_time diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_stop_time b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_stop_time similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_stop_time rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_stop_time diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_step_base b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_target_temp similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_step_base rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_target_temp diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_temp_sel b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_temp_sel similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_temp_sel rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_temp_sel diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_step_tol b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_temp_tolerance similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_step_tol rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_temp_tolerance diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_duty_base b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_duty_base new file mode 100644 index 0000000..573541a --- /dev/null +++ b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_duty_base @@ -0,0 +1 @@ +0 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_duty_step b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_duty_step new file mode 100644 index 0000000..573541a --- /dev/null +++ b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_duty_step @@ -0,0 +1 @@ +0 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_sel b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_sel similarity index 100% rename from collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon1/pwm1_weight_temp_sel rename to collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_sel diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step new file mode 100644 index 0000000..573541a --- /dev/null +++ b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step @@ -0,0 +1 @@ +0 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step_base b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step_base new file mode 100644 index 0000000..573541a --- /dev/null +++ b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step_base @@ -0,0 +1 @@ +0 diff --git a/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step_tol b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step_tol new file mode 100644 index 0000000..573541a --- /dev/null +++ b/collector/fixtures/sys/devices/platform/nct6775.656/hwmon/hwmon3/pwm1_weight_temp_step_tol @@ -0,0 +1 @@ +0 diff --git a/collector/hwmon_linux.go b/collector/hwmon_linux.go index 4ee1bc0..d879aca 100644 --- a/collector/hwmon_linux.go +++ b/collector/hwmon_linux.go @@ -306,22 +306,12 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) { // human readable names would be bat0 or coretemp, while a path string // could be platform_applesmc.768 - // preference 1: is there a name file - - sysnameRaw, nameErr := ioutil.ReadFile(path.Join(dir, "name")) - if nameErr == nil && string(sysnameRaw) != "" { - cleanName := cleanMetricName(string(sysnameRaw)) - if cleanName != "" { - return cleanName, nil - } - } - - // preference 2: construct a name based on device + // preference 1: construct a name based on device name, always unique devicePath, devErr := filepath.EvalSymlinks(path.Join(dir, "device")) if devErr == nil { devPathPrefix, devName := path.Split(devicePath) - _, devType := path.Split(devPathPrefix) + _, devType := path.Split(strings.TrimRight(devPathPrefix, "/")) cleanDevName := cleanMetricName(devName) cleanDevType := cleanMetricName(devType) @@ -335,6 +325,15 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) { } } + // preference 2: is there a name file + sysnameRaw, nameErr := ioutil.ReadFile(path.Join(dir, "name")) + if nameErr == nil && string(sysnameRaw) != "" { + cleanName := cleanMetricName(string(sysnameRaw)) + if cleanName != "" { + return cleanName, nil + } + } + // it looks bad, name and device don't provide enough information // return a hwmon[0-9]* name