"Temperature",
"IgnoreSelectedTemperature",
"ShowPower",
- "PowerSensor",
- "IgnorePowerSelected"
+ "Power",
+ "IgnoreSelectedPower"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
invert = 0;
ignorelist_set_invert(temp_ignore,invert);
}
- else if (strcasecmp("PowerSensor",key) == 0)
+ else if (strcasecmp("Power",key) == 0)
{
ignorelist_add(power_ignore,value);
}
- else if (strcasecmp("IgnorePowerSelected",key) == 0)
+ else if (strcasecmp("IgnoreSelectedPower",key) == 0)
{
int invert = 1;
if (IS_TRUE(value))
return (0);
}
-static void mic_submit_power(int micnumber, const char *type_instance, gauge_t val)
+static void mic_submit_power(int micnumber, const char *type, const char *type_instance, gauge_t val)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
strncpy (vl.host, hostname_g, sizeof (vl.host));
strncpy (vl.plugin, "mic", sizeof (vl.plugin));
ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance), "%i", micnumber);
- strncpy (vl.type, "power", sizeof (vl.type));
+ strncpy (vl.type, type, sizeof (vl.type));
strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
return (1);
}
+ /* power is in uWatts, current in mA, voltage in uVolts.. convert to
+ * base unit */
#define SUB_POWER(name) do { if (ignorelist_match(power_ignore,#name)==0) \
- mic_submit_power(mic,#name,(gauge_t)power_use.name.prr); \
+ mic_submit_power(mic,"power",#name,(gauge_t)power_use.name.prr*0.000001); \
} while(0)
#define SUB_VOLTS(name) do { if (ignorelist_match(power_ignore,#name)==0) {\
- mic_submit_power(mic,#name "-pwr",(gauge_t)power_use.name.pwr); \
- mic_submit_power(mic,#name "-cur",(gauge_t)power_use.name.pwr); \
- mic_submit_power(mic,#name "-volt",(gauge_t)power_use.name.pwr); \
+ mic_submit_power(mic,"power",#name,(gauge_t)(power_use.name.pwr*0.000001)); \
+ mic_submit_power(mic,"current",#name,(gauge_t)(power_use.name.cur*0.001)); \
+ mic_submit_power(mic,"voltage",#name,(gauge_t)(power_use.name.volt*0.000001)); \
}} while(0)
SUB_POWER(total0);
static int mic_shutdown (void)
{
if (mic_handle)
- MicCloseAPI(&mic_handle);
+ MicCloseAPI(&mic_handle);
+ mic_handle = NULL;
+
return (0);
}