Merge branch 'collectd-4.0' into collectd-4.1

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index 2539c32..8f315c9 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -1,9 +1,11 @@
 /*
  * collectd - src/apcups.c
+ * Copyright (C) 2007 Florian octo Forster
  * Copyright (C) 2006 Anthony Gialluca <tonyabg at charter.net>
  * Copyright (C) 2000-2004 Kern Sibbald
  * Copyright (C) 1996-99 Andre M. Hedrick <andre at suse.com>
  *
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General
  * Public License as published by the Free Software Foundation.
@@ -78,59 +80,6 @@ static int   conf_port = NISPORT;
 
 static int global_sockfd = -1;
 
-/* 
- * The following are only if not compiled to test the module with its own main.
-*/
-static data_source_t data_source_voltage[1] =
-{
-       {"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t ds_voltage =
-{
-       "voltage", 1, data_source_voltage
-};
-
-static data_source_t data_source_percent[1] =
-{
-       {"percent", DS_TYPE_GAUGE, 0, 100.1}
-};
-
-static data_set_t ds_percent =
-{
-       "percent", 1, data_source_percent
-};
-
-static data_source_t data_source_timeleft[1] =
-{
-       {"timeleft", DS_TYPE_GAUGE, 0, 100.0}
-};
-
-static data_set_t ds_timeleft =
-{
-       "timeleft", 1, data_source_timeleft
-};
-
-static data_source_t data_source_temperature[1] =
-{
-       {"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t ds_temperature =
-{
-       "temperature", 1, data_source_temperature
-};
-
-static data_source_t data_source_frequency[1] =
-{
-       {"frequency", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t ds_frequency =
-{
-       "frequency", 1, data_source_frequency
-};
-
 static const char *config_keys[] =
 {
        "Host",
@@ -440,14 +389,14 @@ static void apc_submit_generic (char *type, char *type_inst, double value)
 
 static void apc_submit (struct apc_detail_s *apcups_detail)
 {
-       apc_submit_generic ("apcups_voltage",    "input",   apcups_detail->linev);
-       apc_submit_generic ("apcups_voltage",    "output",  apcups_detail->outputv);
-       apc_submit_generic ("apcups_voltage",    "battery", apcups_detail->battv);
-       apc_submit_generic ("apcups_charge",     "",        apcups_detail->bcharge);
-       apc_submit_generic ("apcups_charge_pct", "",        apcups_detail->loadpct);
-       apc_submit_generic ("apcups_timeleft",   "",        apcups_detail->timeleft);
-       apc_submit_generic ("apcups_temp",       "",        apcups_detail->itemp);
-       apc_submit_generic ("apcups_frequency",  "input",   apcups_detail->linefreq);
+       apc_submit_generic ("voltage",    "input",   apcups_detail->linev);
+       apc_submit_generic ("voltage",    "output",  apcups_detail->outputv);
+       apc_submit_generic ("voltage",    "battery", apcups_detail->battv);
+       apc_submit_generic ("charge",     "",        apcups_detail->bcharge);
+       apc_submit_generic ("percent",    "charge",  apcups_detail->loadpct);
+       apc_submit_generic ("timeleft",   "",        apcups_detail->timeleft);
+       apc_submit_generic ("temperature", "",       apcups_detail->itemp);
+       apc_submit_generic ("frequency",  "input",   apcups_detail->linefreq);
 }
 
 static int apcups_read (void)
@@ -488,22 +437,10 @@ static int apcups_read (void)
        return (0);
 } /* apcups_read */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-       if (load & MR_DATASETS)
-       {
-               plugin_register_data_set (&ds_voltage);
-               plugin_register_data_set (&ds_percent);
-               plugin_register_data_set (&ds_timeleft);
-               plugin_register_data_set (&ds_temperature);
-               plugin_register_data_set (&ds_frequency);
-       }
-
-       if (load & MR_READ)
-       {
-               plugin_register_config ("apcups", apcups_config, config_keys,
-                               config_keys_num);
-               plugin_register_read ("apcups", apcups_read);
-               plugin_register_shutdown ("apcups", apcups_shutdown);
-       }
+       plugin_register_config ("apcups", apcups_config, config_keys,
+                       config_keys_num);
+       plugin_register_read ("apcups", apcups_read);
+       plugin_register_shutdown ("apcups", apcups_shutdown);
 } /* void module_register */