From 9eee7fad582edfdbc5f7552b24f877fe6e29b765 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Sun, 19 Apr 2020 01:11:45 -0500
Subject: [PATCH] Use standard sensor type names

---
 app/Models/Sensor.php                         | 28 +---------------
 ...0532_eventlog_sensor_reference_cleanup.php | 32 +++++++++++++++++++
 includes/polling/functions.inc.php            |  4 +--
 3 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100644 database/migrations/2020_04_19_010532_eventlog_sensor_reference_cleanup.php

diff --git a/app/Models/Sensor.php b/app/Models/Sensor.php
index e4a482f180..256baa82c7 100644
--- a/app/Models/Sensor.php
+++ b/app/Models/Sensor.php
@@ -55,33 +55,7 @@ class Sensor extends DeviceRelatedModel
 
     public static function getTypes()
     {
-        return ['Airflow',
-                'ber',
-                'Battery Charge',
-                'chromatic_dispersion',
-                'Cooling',
-                'count',
-                'Current',
-                'dBm',
-                'delay',
-                'Energy Efficiency Ratio',
-                'Fanspeed',
-                'Frequency',
-                'Humidity',
-                'Load',
-                'power_consumed',
-                'power_factor',
-                'Power',
-                'Pressure',
-                'quality_factor',
-                'Runtime',
-                'Wireless',
-                'snr',
-                'State',
-                'Temperature',
-                'Voltage',
-                'Water Flow Rate',
-                ];
+        return array_keys(self::$icons);
     }
 
     // for the legacy menu
diff --git a/database/migrations/2020_04_19_010532_eventlog_sensor_reference_cleanup.php b/database/migrations/2020_04_19_010532_eventlog_sensor_reference_cleanup.php
new file mode 100644
index 0000000000..c94cfb066d
--- /dev/null
+++ b/database/migrations/2020_04_19_010532_eventlog_sensor_reference_cleanup.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class EventlogSensorReferenceCleanup extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        foreach (\App\Models\Sensor::getTypes() as $type) {
+            DB::table('eventlog')->where('type', ucfirst($type))->update(['type' => $type]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        foreach (\App\Models\Sensor::getTypes() as $type) {
+            DB::table('eventlog')->where('type', $type)->update(['type' => ucfirst($type)]);
+        }
+    }
+}
diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
index f5ab7598f3..0bba951097 100644
--- a/includes/polling/functions.inc.php
+++ b/includes/polling/functions.inc.php
@@ -199,10 +199,10 @@ function record_sensor_data($device, $all_sensors)
         // FIXME also warn when crossing WARN level!
         if ($sensor['sensor_limit_low'] != '' && $prev_sensor_value > $sensor['sensor_limit_low'] && $sensor_value < $sensor['sensor_limit_low'] && $sensor['sensor_alert'] == 1) {
             echo 'Alerting for '.$device['hostname'].' '.$sensor['sensor_descr']."\n";
-            log_event("$class under threshold: $sensor_value $unit (< {$sensor['sensor_limit_low']} $unit)", $device, $class, 4, $sensor['sensor_id']);
+            log_event("$class under threshold: $sensor_value $unit (< {$sensor['sensor_limit_low']} $unit)", $device, $sensor['sensor_class'], 4, $sensor['sensor_id']);
         } elseif ($sensor['sensor_limit'] != '' && $prev_sensor_value < $sensor['sensor_limit'] && $sensor_value > $sensor['sensor_limit'] && $sensor['sensor_alert'] == 1) {
             echo 'Alerting for '.$device['hostname'].' '.$sensor['sensor_descr']."\n";
-            log_event("$class above threshold: $sensor_value $unit (> {$sensor['sensor_limit']} $unit)", $device, $class, 4, $sensor['sensor_id']);
+            log_event("$class above threshold: $sensor_value $unit (> {$sensor['sensor_limit']} $unit)", $device, $sensor['sensor_class'], 4, $sensor['sensor_id']);
         }
         if ($sensor['sensor_class'] == 'state' && $prev_sensor_value != $sensor_value) {
             $trans = array_column(