chg: usr: Changed feed dir to /data/sitch/feed, and log dir to /data/sitch/log/. Relocated filebeat registry to /data/sitch/log/fb_registry

* Target specific radio types.  Speed up feed ingestion for GSM-only sensors.

* Added alarm 130 for detection of a bad Mobile Country Code (MCC).

* Use human-friendly sensor name in metrics, derived from Resin device name.  Location name override still works for non-Resin environments.

* Length of sensor processing queues added to health check.

* Alerts contain sensor ID, derived from Resin device name.

* Geo distance check validates that lon/lat could be valid coordinates.

* Fixed lat/lon swap bug in Utility.calculate_distance

Author: ashmastaflash

Dockerfile

@@ -47,23 +47,13 @@ COPY configs/filebeat.json /etc/templates
 # Get the scripts in place
 COPY sitch/ /app/sitch
 
+COPY requirements.txt /requirements.txt
+
 WORKDIR /app/sitch
 
 RUN pip install virtualenv==15.1.0 && \
     virtualenv venv && \
     . ./venv/bin/activate && \
-    pip install \
-    psutil==5.0.1 \
-    pyserial==3.2.1 \
-    pyyaml==3.12 \
-    gps3==0.33.3 \
-    hvac==0.2.16 \
-    kalibrate==1.1.2 \
-    haversine==0.4.5 \
-    python-dateutil==2.6.0 \
-    python-geoip==1.2 \
-    python-geoip-geolite2==2015.303 \
-    pyudev==0.21.0 \
-    LatLon==1.0.2
+    pip install -r /requirements.txt
 
 CMD /app/sitch/venv/bin/python ./runner.py 2>&1

README.md

@@ -61,7 +61,6 @@ We expect the following environment variables to be set in Resin:
 | FEED_RADIO_TARGETS | List of radios for feed (optional, defaults to GSM)     |
 
 
-
 The CGI_WHITELIST will suppress alert 110 (BTS metadata changed) if the CGI of
 channel 0 in your GSM modem output matches an item in CGI_WHITELIST.  This is
 the format you should use: `MCC:MNC:LAC:CELLID,MCC:MNC:LAC:CELLID`  This is

requirements.txt

@@ -0,0 +1,12 @@
+psutil==5.0.1
+pyserial==3.2.1
+pyyaml==3.12
+gps3==0.33.3
+hvac==0.2.16
+kalibrate==1.1.2
+haversine==0.4.5
+python-dateutil==2.6.0
+python-geoip==1.2
+python-geoip-geolite2==2015.303
+pyudev==0.21.0
+LatLon==1.0.2

sitch/sitchlib/__init__.py

@@ -14,4 +14,4 @@
 from geo_correlator import GeoCorrelator  # NOQA
 
 __author__ = "Ash Wilson"
-__version__ = "3.7.0"
+__version__ = "3.7.1"

sitch/sitchlib/cgi_correlator.py

@@ -160,8 +160,8 @@ def build_chan_here(cls, channel, state):
         try:
             chan["lat"] = channel["feed_info"]["lat"]
             chan["lon"] = channel["feed_info"]["lon"]
-            here["lat"] = state["geometry"]["coordinates"][0]
-            here["lon"] = state["geometry"]["coordinates"][1]
+            here["lat"] = state["geometry"]["coordinates"][1]
+            here["lon"] = state["geometry"]["coordinates"][0]
         except (TypeError, ValueError, KeyError) as e:
             print("CgiCorrelator: Incomplete geo info...")
             print("CgiCorrelator: Error: %s" % str(e))

sitch/sitchlib/location_tool.py

@@ -26,6 +26,24 @@ def get_geo_for_ip(cls, ip_address):
             print(msg)
             return None
 
+    @classmethod
+    def validate_geo(cls, latlon):
+        """Validate that lon/lat are valid numbers for Planet Earth"""
+        lat = float(latlon[0])
+        lon = float(latlon[1])
+        valid = True
+        if lat < -90:
+            valid = False
+        elif lat > 90:
+            valid = False
+        elif lon < -180:
+            valid = False
+        elif lon > 180:
+            valid = False
+        else:
+            pass
+        return valid
+
     @classmethod
     def get_distance_between_points(cls, point_1, point_2):
         """Calculate distance between points.
@@ -40,6 +58,12 @@ def get_distance_between_points(cls, point_1, point_2):
         if None in [point_1, point_2]:
             print("LocationTool: Invalid geo value. Returning 0 for distance.")
             distance = 0
+        elif cls.validate_geo(point_1) is False:
+            print("LocationTool: Invalid geo lat/lon value(%s). Distance = 0." % str(point_1))  # NOQA
+            distance = 0
+        elif cls.validate_geo(point_2) is False:
+            print("LocationTool: Invalid geo lat/lon value(%s). Distance = 0." % str(point_2))  # NOQA
+            distance = 0
         else:
             point_1 = (float(point_1[0]), float(point_1[1]))
             point_2 = (float(point_2[0]), float(point_2[1]))

sitch/sitchlib/utility.py

@@ -122,8 +122,8 @@ def calculate_distance(cls, lon_1, lat_1, lon_2, lat_2):
         if None in [lon_1, lat_1, lon_2, lat_2]:
             print("Utility: Geo coordinate is zero, not resolving distance.")
             return 0
-        pos_1 = (lon_1, lat_1)
-        pos_2 = (lon_2, lat_2)
+        pos_1 = (lat_1, lon_1)
+        pos_2 = (lat_2, lon_2)
         dist_in_km = LocationTool.get_distance_between_points(pos_1, pos_2)
         dist_in_m = dist_in_km * 1000
         return dist_in_m

sitch/tests/unit/test_unit_location_tool.py

@@ -32,3 +32,13 @@ def test_get_distance_between_points_fail(self):
         chattanooga = (35.244, 85.1835)
         distance = loc_tool.get_distance_between_points(elseweyr, chattanooga)
         assert distance == 0
+
+    def test_geo_validator_pass(self):
+        lon = -122.4095923
+        lat = 37.782316
+        assert sitchlib.LocationTool.validate_geo((lat, lon)) is True
+
+    def test_geo_validator_fail(self):
+        lat = -122.4095923
+        lon = 37.782316
+        assert sitchlib.LocationTool.validate_geo((lat, lon)) is False