#ifdef HAVE_GTOP
#include "sysinfo.h"
-#include "cpu.h"
+#include <pgtop2.h>
#endif
+#include <hdd.h>
+#include <lmsensor.h>
#include <plog.h>
#include "psensor_json.h"
#include <pmutex.h>
psensor_init();
- server_data.sensors = get_all_sensors(0, 600);
+ hddtemp_psensor_list_append(&server_data.sensors, 600);
+
+ lmsensor_psensor_list_append(&server_data.sensors, 600);
#ifdef HAVE_GTOP
server_data.cpu_usage = create_cpu_usage_sensor(600);
#endif
psensor_list_update_measures(server_data.sensors);
+ lmsensor_psensor_list_update(server_data.sensors);
+
psensor_log_measures(server_data.sensors);
pmutex_unlock(&mutex);
#ifdef HAVE_GTOP
sysinfo_cleanup();
- cpu_cleanup();
#endif
if (log_file != DEFAULT_LOG_FILE)