Naming things: Use correct repository addresses and labels

CHANGES.rst

@@ -27,7 +27,7 @@ in progress
 =================
 - Add adapter for OpenAQ
 - Slightly improve reverse geocoding
-- Use improved "grafana-map-panel" instead of the original Worldmap
+- Use improved "panodata-map-panel" instead of the original Worldmap
 - Update documentation
 
 

README.rst

@@ -4,8 +4,8 @@
 .. image:: https://img.shields.io/pypi/v/luftdatenpumpe.svg
     :target: https://pypi.org/project/luftdatenpumpe/
 
-.. image:: https://img.shields.io/github/tag/hiveeyes/luftdatenpumpe.svg
-    :target: https://github.com/hiveeyes/luftdatenpumpe
+.. image:: https://img.shields.io/github/tag/earthobservations/luftdatenpumpe.svg
+    :target: https://github.com/earthobservations/luftdatenpumpe
 
 .. image:: https://assets.okfn.org/images/ok_buttons/od_80x15_red_green.png
     :target: https://okfn.org/opendata/
@@ -31,8 +31,8 @@ Filter by station-id, sensor-id and sensor-type, apply reverse geocoding,
 store into TSDB_ and RDBMS_ databases (InfluxDB_ and PostGIS_),
 publish to MQTT_ or just output as JSON.
 
-.. figure:: https://cdn.jsdelivr.net/gh/hiveeyes/luftdatenpumpe@master/doc/logo.svg
-    :target: https://github.com/hiveeyes/luftdatenpumpe
+.. figure:: https://cdn.jsdelivr.net/gh/earthobservations/luftdatenpumpe@main/doc/logo.svg
+    :target: https://github.com/earthobservations/luftdatenpumpe
     :height: 200px
     :width: 200px
 
@@ -197,23 +197,23 @@ Icons and pictograms
 
 
 
-.. _doc-virtualenv: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/virtualenv.rst
-.. _doc-postgis: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/postgis.rst
+.. _doc-virtualenv: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/virtualenv.rst
+.. _doc-postgis: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/postgis.rst
 
 
 .. _luftdaten.info: https://luftdaten.info/
 .. _irceline: http://www.irceline.be/en/documentation/open-data
 .. _OpenAQ: https://openaq.org/
 
-.. _Luftdatenpumpe: https://github.com/hiveeyes/luftdatenpumpe
+.. _Luftdatenpumpe: https://github.com/earthobservations/luftdatenpumpe
 
-.. _Testimonials for Luftdatenpumpe: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/testimonials.rst
-.. _luftdatenpumpe --help: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/usage.rst
-.. _install Luftdatenpumpe: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/luftdatenpumpe.rst
-.. _Luftdaten-Viewer Applications: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/ldview-applications.rst
-.. _Luftdaten-Viewer Databases: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/ldview-databases.rst
-.. _Luftdaten-Viewer Grafana: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/ldview-grafana.rst
-.. _Luftdaten-Viewer Cron Job: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/ldview-cronjob.rst
+.. _Testimonials for Luftdatenpumpe: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/testimonials.rst
+.. _luftdatenpumpe --help: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/usage.rst
+.. _install Luftdatenpumpe: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/luftdatenpumpe.rst
+.. _Luftdaten-Viewer Applications: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/ldview-applications.rst
+.. _Luftdaten-Viewer Databases: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/ldview-databases.rst
+.. _Luftdaten-Viewer Grafana: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/ldview-grafana.rst
+.. _Luftdaten-Viewer Cron Job: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/ldview-cronjob.rst
 
 .. _Erneuerung der Luftdatenpumpe: https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199
 

doc/setup/ldview-applications.rst

@@ -10,6 +10,6 @@ Install
 - `Luftdaten-Viewer Applications for CentOS`_
 - `Luftdaten-Viewer Applications for macOS`_
 
-.. _Luftdaten-Viewer Applications for Debian: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/ldview-applications-debian.rst
-.. _Luftdaten-Viewer Applications for CentOS: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/ldview-applications-centos.rst
-.. _Luftdaten-Viewer Applications for macOS: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/setup/ldview-applications-macos.rst
+.. _Luftdaten-Viewer Applications for Debian: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/ldview-applications-debian.rst
+.. _Luftdaten-Viewer Applications for CentOS: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/ldview-applications-centos.rst
+.. _Luftdaten-Viewer Applications for macOS: https://github.com/earthobservations/luftdatenpumpe/blob/main/doc/setup/ldview-applications-macos.rst

doc/setup/ldview-cronjob.rst

@@ -12,9 +12,9 @@ Create "workbench" user::
 
 Install cron file::
 
-    curl --silent https://raw.githubusercontent.com/hiveeyes/luftdatenpumpe/master/etc/luftdaten-viewer.cron > /etc/cron.d/luftdaten-viewer
-    curl --silent https://raw.githubusercontent.com/hiveeyes/luftdatenpumpe/master/tools/pflock > /usr/local/bin/pflock
-    curl --silent https://raw.githubusercontent.com/hiveeyes/luftdatenpumpe/master/tools/safewrite > /usr/local/bin/safewrite
+    curl --silent https://raw.githubusercontent.com/earthobservations/luftdatenpumpe/main/etc/luftdaten-viewer.cron > /etc/cron.d/luftdaten-viewer
+    curl --silent https://raw.githubusercontent.com/earthobservations/luftdatenpumpe/main/tools/pflock > /usr/local/bin/pflock
+    curl --silent https://raw.githubusercontent.com/earthobservations/luftdatenpumpe/main/tools/safewrite > /usr/local/bin/safewrite
     chmod +x /usr/local/bin/pflock /usr/local/bin/safewrite
 
 

doc/setup/ldview-grafana.rst

@@ -19,8 +19,8 @@ Flux datasource::
 Install Worldmap Panel NG::
 
     grafana-cli \
-        --pluginUrl https://github.com/panodata/grafana-map-panel/releases/download/0.8.1/grafana-map-panel-0.8.1.zip \
-        plugins install grafana-map-panel
+        --pluginUrl https://github.com/panodata/panodata-map-panel/releases/download/0.16.0/panodata-map-panel-0.16.0.zip \
+        plugins install panodata-map-panel
 
 Restart Grafana instance::
 

doc/setup/redis.rst

@@ -50,4 +50,4 @@ Please run ``systemctl daemon-reload`` after adding this file or making changes
 
 We have been tracking this issue at [1].
 
-[1] https://github.com/panodata/luftdatenpumpe/issues/7
+[1] https://github.com/earthobservations/luftdatenpumpe/issues/7

doc/testimonials.rst

@@ -8,7 +8,7 @@ Some example installations, usually running live data feeds through them.
 **************
 luftdaten.info
 **************
-Implemented by `luftdaten_info.py <https://github.com/hiveeyes/luftdatenpumpe/blob/0.11.0/luftdatenpumpe/source/luftdaten_info.py>`_
+Implemented by `luftdaten_info.py <https://github.com/earthobservations/luftdatenpumpe/blob/0.11.0/luftdatenpumpe/source/luftdaten_info.py>`_
 
 Dashboards
 ==========
@@ -37,7 +37,7 @@ Labs
 ********
 IRCELINE
 ********
-Implemented by `irceline.py <https://github.com/hiveeyes/luftdatenpumpe/blob/0.11.0/luftdatenpumpe/source/irceline.py>`_
+Implemented by `irceline.py <https://github.com/earthobservations/luftdatenpumpe/blob/0.11.0/luftdatenpumpe/source/irceline.py>`_
 
 Dashboards
 ==========

etc/luftdaten-viewer.cron

@@ -3,7 +3,7 @@
 # Feed data from environmental information services into the system.
 #
 # See also:
-# - https://github.com/hiveeyes/luftdatenpumpe
+# - https://github.com/earthobservations/luftdatenpumpe
 # - https://community.hiveeyes.org/t/ldi-data-plane-v2/1412
 
 # ATTENTION: DISABLED due to maintenance work.

luftdatenpumpe/grafana/dashboard-map.json

@@ -61,7 +61,7 @@
         "targetBlank": true,
         "title": "Luftdatenpumpe @ GitHub",
         "type": "link",
-        "url": "https://github.com/hiveeyes/luftdatenpumpe"
+        "url": "https://github.com/earthobservations/luftdatenpumpe"
       },
       {
         "icon": "external link",
@@ -184,7 +184,7 @@
         "timeShift": null,
         "title": "PM10 particulates",
         "transparent": false,
-        "type": "grafana-map-panel",
+        "type": "panodata-map-panel",
         "unitPlural": "μg/m³ (PM10)",
         "unitSingle": "",
         "unitSingular": "μg/m³ (PM10)",
@@ -258,7 +258,7 @@
         "type": "text"
       },
       {
-        "content": "## About Luftdatenpumpe\n\n#### Features\n- **Data sources**: [luftdaten.info] (LDI), [IRCELINE]\n- **Production**: [Luftdatenpumpe]\n- **Development**: [Erneuerung der Luftdatenpumpe], [LDI data plane v2]. All contributions welcome. \n- **Composition**: [The Hiveeyes Project]. Developing a flexible beehive monitoring infrastructure.\n\n#### Production process\n1. [Luftdatenpumpe] acquires the current window of measurement readings from the upstream data source.\n2. While iterating the readings, it collects information about all stations and sensors they are originating from.\n3. Then, each stations location information gets enhanced by \n   - attaching its geospatial position as a [Geohash].\n   - attaching a synthetic real-world address resolved using the reverse geocoding service [Nominatim] by [OpenStreetMap].\n4. Finally, station information is stored into a PostGIS database using the fine  \n   [dataset] package while observation/measurement data is stored into InfluxDB.\n5. Luftdatenpumpe also includes templates for the Grafana panels you are seeing here.\n\nEnjoy exploring and stay curious.\n\n[luftdaten.info]: http://luftdaten.info/\n[IRCELINE]: https://github.com/irceline/open_data\n[Luftdatenpumpe]: https://github.com/hiveeyes/luftdatenpumpe\n[Erneuerung der Luftdatenpumpe]: https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199\n[LDI data plane v2]: https://community.hiveeyes.org/t/ldi-data-plane-v2/1412\n[The Hiveeyes Project]: https://hiveeyes.org/\n\n[OpenStreetMap]: https://en.wikipedia.org/wiki/OpenStreetMap\n[Nominatim]: https://wiki.openstreetmap.org/wiki/Nominatim\n[Geohash]: https://en.wikipedia.org/wiki/Geohash\n[dataset]: https://dataset.readthedocs.io/\n[SQLAlchemy]: https://www.sqlalchemy.org/\n[RDBMS]: https://en.wikipedia.org/wiki/Relational_database_management_system\n",
+        "content": "## About Luftdatenpumpe\n\n#### Features\n- **Data sources**: [luftdaten.info] (LDI), [IRCELINE]\n- **Production**: [Luftdatenpumpe]\n- **Development**: [Erneuerung der Luftdatenpumpe], [LDI data plane v2]. All contributions welcome. \n- **Composition**: [The Hiveeyes Project]. Developing a flexible beehive monitoring infrastructure.\n\n#### Production process\n1. [Luftdatenpumpe] acquires the current window of measurement readings from the upstream data source.\n2. While iterating the readings, it collects information about all stations and sensors they are originating from.\n3. Then, each stations location information gets enhanced by \n   - attaching its geospatial position as a [Geohash].\n   - attaching a synthetic real-world address resolved using the reverse geocoding service [Nominatim] by [OpenStreetMap].\n4. Finally, station information is stored into a PostGIS database using the fine  \n   [dataset] package while observation/measurement data is stored into InfluxDB.\n5. Luftdatenpumpe also includes templates for the Grafana panels you are seeing here.\n\nEnjoy exploring and stay curious.\n\n[luftdaten.info]: http://luftdaten.info/\n[IRCELINE]: https://github.com/irceline/open_data\n[Luftdatenpumpe]: https://github.com/earthobservations/luftdatenpumpe\n[Erneuerung der Luftdatenpumpe]: https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199\n[LDI data plane v2]: https://community.hiveeyes.org/t/ldi-data-plane-v2/1412\n[The Hiveeyes Project]: https://hiveeyes.org/\n\n[OpenStreetMap]: https://en.wikipedia.org/wiki/OpenStreetMap\n[Nominatim]: https://wiki.openstreetmap.org/wiki/Nominatim\n[Geohash]: https://en.wikipedia.org/wiki/Geohash\n[dataset]: https://dataset.readthedocs.io/\n[SQLAlchemy]: https://www.sqlalchemy.org/\n[RDBMS]: https://en.wikipedia.org/wiki/Relational_database_management_system\n",
         "gridPos": {
           "h": 19,
           "w": 12,

luftdatenpumpe/grafana/dashboard-trend.json

@@ -64,7 +64,7 @@
         "targetBlank": true,
         "title": "Luftdatenpumpe @ GitHub",
         "type": "link",
-        "url": "https://github.com/hiveeyes/luftdatenpumpe"
+        "url": "https://github.com/earthobservations/luftdatenpumpe"
       },
       {
         "icon": "external link",
@@ -1410,7 +1410,7 @@
         "type": "text"
       },
       {
-        "content": "## About Luftdatenpumpe\n\n#### Features\n- **Data sources**: [luftdaten.info] (LDI), [IRCELINE]\n- **Production**: [Luftdatenpumpe]\n- **Development**: [Erneuerung der Luftdatenpumpe], [LDI data plane v2]. All contributions welcome. \n- **Composition**: [The Hiveeyes Project]. Developing a flexible beehive monitoring infrastructure.\n\n#### Production process\n1. [Luftdatenpumpe] acquires the current window of measurement readings from the upstream data source.\n2. While iterating the readings, it collects information about all stations and sensors they are originating from.\n3. Then, each stations location information gets enhanced by \n   - attaching its geospatial position as a [Geohash].\n   - attaching a synthetic real-world address resolved using the reverse geocoding service [Nominatim] by [OpenStreetMap].\n4. Finally, station information is stored into a PostGIS database using the fine  \n   [dataset] package while observation/measurement data is stored into InfluxDB.\n5. Luftdatenpumpe also includes templates for the Grafana panels you are seeing here.\n\nEnjoy exploring and stay curious.\n\n[luftdaten.info]: http://luftdaten.info/\n[IRCELINE]: https://github.com/irceline/open_data\n[Luftdatenpumpe]: https://github.com/hiveeyes/luftdatenpumpe\n[Erneuerung der Luftdatenpumpe]: https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199\n[LDI data plane v2]: https://community.hiveeyes.org/t/ldi-data-plane-v2/1412\n[The Hiveeyes Project]: https://hiveeyes.org/\n\n[OpenStreetMap]: https://en.wikipedia.org/wiki/OpenStreetMap\n[Nominatim]: https://wiki.openstreetmap.org/wiki/Nominatim\n[Geohash]: https://en.wikipedia.org/wiki/Geohash\n[dataset]: https://dataset.readthedocs.io/\n[SQLAlchemy]: https://www.sqlalchemy.org/\n[RDBMS]: https://en.wikipedia.org/wiki/Relational_database_management_system\n",
+        "content": "## About Luftdatenpumpe\n\n#### Features\n- **Data sources**: [luftdaten.info] (LDI), [IRCELINE]\n- **Production**: [Luftdatenpumpe]\n- **Development**: [Erneuerung der Luftdatenpumpe], [LDI data plane v2]. All contributions welcome. \n- **Composition**: [The Hiveeyes Project]. Developing a flexible beehive monitoring infrastructure.\n\n#### Production process\n1. [Luftdatenpumpe] acquires the current window of measurement readings from the upstream data source.\n2. While iterating the readings, it collects information about all stations and sensors they are originating from.\n3. Then, each stations location information gets enhanced by \n   - attaching its geospatial position as a [Geohash].\n   - attaching a synthetic real-world address resolved using the reverse geocoding service [Nominatim] by [OpenStreetMap].\n4. Finally, station information is stored into a PostGIS database using the fine  \n   [dataset] package while observation/measurement data is stored into InfluxDB.\n5. Luftdatenpumpe also includes templates for the Grafana panels you are seeing here.\n\nEnjoy exploring and stay curious.\n\n[luftdaten.info]: http://luftdaten.info/\n[IRCELINE]: https://github.com/irceline/open_data\n[Luftdatenpumpe]: https://github.com/earthobservations/luftdatenpumpe\n[Erneuerung der Luftdatenpumpe]: https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199\n[LDI data plane v2]: https://community.hiveeyes.org/t/ldi-data-plane-v2/1412\n[The Hiveeyes Project]: https://hiveeyes.org/\n\n[OpenStreetMap]: https://en.wikipedia.org/wiki/OpenStreetMap\n[Nominatim]: https://wiki.openstreetmap.org/wiki/Nominatim\n[Geohash]: https://en.wikipedia.org/wiki/Geohash\n[dataset]: https://dataset.readthedocs.io/\n[SQLAlchemy]: https://www.sqlalchemy.org/\n[RDBMS]: https://en.wikipedia.org/wiki/Relational_database_management_system\n",
         "gridPos": {
           "h": 19,
           "w": 12,

luftdatenpumpe/grafana/doc/about-luftdatenpumpe.md

@@ -22,7 +22,7 @@ Enjoy exploring and stay curious.
 [IRCELINE]: http://www.irceline.be/en/documentation/open-data
 [OpenAQ]: https://openaq.org/
 
-[Luftdatenpumpe]: https://github.com/hiveeyes/luftdatenpumpe
+[Luftdatenpumpe]: https://github.com/earthobservations/luftdatenpumpe
 [Erneuerung der Luftdatenpumpe]: https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199
 [LDI data plane v2]: https://community.hiveeyes.org/t/ldi-data-plane-v2/1412
 [The Hiveeyes Project]: https://hiveeyes.org/

setup.py

@@ -96,7 +96,7 @@
         ],
       author='Andreas Motl',
       author_email='[email protected]',
-      url='https://github.com/panodata/luftdatenpumpe',
+      url='https://github.com/earthobservations/luftdatenpumpe',
       keywords='luftdaten.info irceline openaq '
                'air quality particulate matter pollution '
                'feinstaub luftdaten '