Add networking block

## [1.7.3](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.2...v1.7.3) (2021-04-12)

### Bug Fixes

* Empty commit to get recent changes into build (last commit should've been labeled this) ([e513752](e513752c46))

.gitlab-ci.yml

@@ -7,6 +7,7 @@ stages:
 - test
 - build
 - push_local
+- release
 - push_dockerhub
 
 .docker_base:
@@ -28,7 +29,15 @@ build:
     - .docker_base
   stage: build
   script:
-  - docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA ./Docker/
+  - docker pull $CI_REGISTRY_IMAGE:latest || true
+  - >
+    docker build
+    --pull
+    --cache-from $CI_REGISTRY_IMAGE:latest
+    --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+    --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+    --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA
+    ./Docker/
   - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
 push local:
@@ -53,14 +62,51 @@ push dockerhub:
     CI_DOCKERHUB_IMAGE: index.docker.io/evanrich/py-eagle-mqtt
     CI_DOCKERHUB_REGISTRY: docker.io
   only:
-  - master
+  - tags
   script:
   - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_DOCKERHUB_IMAGE:$CI_COMMIT_REF_NAME 
   - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_DOCKERHUB_IMAGE:latest
   - docker login -u "$CI_DOCKERHUB_USER" -p "$CI_DOCKERHUB_PASSWORD" $CI_DOCKERHUB_REGISTRY
-  - docker push $CI_DOCKERHUB_IMAGE:latest
+  - docker push $CI_DOCKERHUB_IMAGE
+
+release:
+  image: node:13
+  stage: release
+  only:
+    refs:
+    - master
+    - alpha
+    # This matches maintenance branches
+    - /^(([0-9]+)\.)?([0-9]+)\.x/
+    # This matches pre-releases
+    - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ 
+  script:
+    - touch CHANGELOG.md
+    - npm install @semantic-release/gitlab @semantic-release/changelog @semantic-release/git
+    - npx semantic-release
+  artifacts:
+    paths:
+    - CHANGELOG.md
 
 sast:
   stage: test
 include:
 - template: Security/SAST.gitlab-ci.yml
+
+sonarqube-check:
+  image: 
+    name: sonarsource/sonar-scanner-cli:latest
+    entrypoint: [""]
+  variables:
+    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
+    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+      - .sonar/cache
+  script: 
+    - sonar-scanner
+  allow_failure: true
+  only:
+    - master # or the name of your main branch

.releaserc.yml

@@ -0,0 +1,13 @@
+plugins:
+  - "@semantic-release/commit-analyzer"
+  - "@semantic-release/release-notes-generator"
+  - - "@semantic-release/changelog"
+    - changelogFile: CHANGELOG.md
+  - "@semantic-release/gitlab"
+  - - "@semantic-release/git"
+    - assets: CHANGELOG.md
+branches:
+  - "master"
+  - "+([0-9])?(.{+([0-9]),x}).x"
+  - name: "alpha"
+    prerelease: "alpha"

CHANGELOG.md

@@ -0,0 +1,75 @@
+## [1.7.3](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.2...v1.7.3) (2021-04-12)
+
+
+### Bug Fixes
+
+* Empty commit to get recent changes into build (last commit should've been labeled this) ([e513752](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/e513752c46cc0b3beb93530f6549661d67196905))
+
+## [1.7.2](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.1...v1.7.2) (2021-04-08)
+
+
+### Bug Fixes
+
+* Cleanup CHANGELOG.md since using new semantic-release format ([a72ac7a](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/a72ac7a1df91cb2231e38e8bbceb5ccf9c93328a))
+* fix asset info for git commit ([00c95c4](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/00c95c42ea98921a1b2da9d2069d41e8e32f34f5))
+
+## [1.7.1](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.0...v1.7.1) (2021-04-08)
+
+
+### Bug Fixes
+
+* refactor Dockerfile to improve build ([40ac8c5](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/40ac8c5ada9b993f53b72dcc14b2d9b7cd183e2f))
+
+## [1.6.10] - 2021-04-06
+
+### Fixed
+
+- Fix docker tagging issue
+
+## [1.6.9] - 2021-04-06
+
+### Fixed
+
+- Remove release-cli section of CI file
+- Add updated README.md
+
+## [1.6.8] - 2021-04-06
+
+### Changed
+
+- Fixed slight issue with tagging
+
+## [1.6.7] - 2021-04-06
+
+### Changed
+
+- Updated base image to Python 3.9.4-alpine3.13
+- Moved changes to this file
+
+### Removed
+
+- Changelog from README.md
+
+## [1.6.6] - 2021-04-03
+
+### Added
+
+- Added CI/CD pipeline to project
+
+### Changed
+
+- Moved project to my own personal Gitlab server for CI/CD pipelines as well as to run security scans on the container image and code
+
+- Updated base image to Python 3.9.3-alpine3.12
+
+## [Unversioned history]
+
+- 2019-07-24: Rebase to python 3.7.4-alpine3.10, update bottle to 0.12.17
+
+- 2019-04-12: Rebase to python 3.7.3-alpine3.9
+
+- 2019-03-08: Rebase to python 3.7.2-alpine3.9, update bottle and astral versions to latest
+
+- 2019-01-03: Rebase to python 3.7.2-alpine3.8, changed logging level to Info (should output to /var/log/tHome/eagle.log)
+
+- 2018-09-10: Ported to Python3, Added pricing info.  Merged into master branch

Docker/Dockerfile

@@ -1,17 +1,26 @@
-FROM python:3.9.3-alpine3.12
-
+FROM python:3.9.4-alpine3.13
 LABEL maintainer="Evan Richardson (evanrich81[at]gmail.com)"
-LABEL version="1.6.6"
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL org.label-schema.schema-version="1.0"
+LABEL org.label-schema.build-date=$BUILD_DATE
+LABEL org.label-schema.name="evanrich/py-eagle-mqtt"
+LABEL org.label-schema.description="Python Rainforest Eagle to MQTT Application"
+LABEL org.label-schema.vcs-url="https://github.com/evanrich/py-eagle-mqtt"
+LABEL org.label-schema.vcs-ref=$VCS_REF
+LABEL org.label-schema.vendor="Evan Richardson"
+LABEL org.label-schema.docker.cmd="docker run --name=py-eagle-mqtt -e MQTT_BROKER_IP=<IP> -e MQTT_BROKER_PORT=1883 -p 22042:22042 -d evanrich/py-eagle-mqtt"
 
 WORKDIR /app
-COPY . /app
+COPY requirements.txt /app
 COPY ./src/conf/logrotate/tHome /etc/logrotate.d/
 ENV PYTHONPATH=/app/src/python
 RUN apk --update add --no-cache logrotate \
 && pip3 install --no-cache-dir  --upgrade pip \
 && pip3 install --no-cache-dir -r requirements.txt
-#RUN rm -rf /var/cache/apk
-
+COPY . /app
 CMD ["/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf"]
 
 EXPOSE 22042

Docker/requirements.txt

@@ -1,4 +1,3 @@
-astral==2.2
 paho-mqtt==1.5.1
 bottle==0.12.19
 defusedxml==0.7.1

Docker/src/bin/tHome-eagle.py

@@ -22,6 +22,7 @@ import json
 import bottle as B
 import tHome as T
 
+
 # ===========================================================================
 def meter(client, data, cfg):
     msg = {
@@ -30,7 +31,8 @@ def meter( client, data, cfg ):
         "produced": data.Produced,  # kWh
     }
 
-   return ( cfg.mqttEnergy, msg )
+    return cfg.mqttEnergy, msg
+
 
 # ===========================================================================
 def instant(client, data, cfg):
@@ -39,7 +41,8 @@ def instant( client, data, cfg ):
         "power": data.Power * 1000,  # W
     }
 
-   return ( cfg.mqttPower, msg )
+    return cfg.mqttPower, msg
+
 
 # ===========================================================================
 def price(client, data, cfg):
@@ -48,7 +51,18 @@ def price( client, data, cfg ):
         "price": data.Price,
         "tier": data.Tier,
     }
-   return ( cfg.mqttPrice, msg )
+    return cfg.mqttPrice, msg
+
+
+# ===========================================================================
+def network(client, data, cfg):
+    msg = {
+        "status": data.Status,
+        "description": data.Description,
+        "linkstrength": data.LinkStrength
+    }
+    return cfg.mqttNetwork, msg
+
 
 # ===========================================================================
 handlers = {
@@ -59,13 +73,14 @@ handlers = {
     "InstantaneousDemand": instant,
     # "MessageCluster" :
     # "MeterInfo" :
-   #"NetworkInfo" : 
+    "NetworkInfo": network,
     "PriceCluster": price,
     # "Reading" :
     # "ScheduleInfo" :
     # "TimeCluster" :
 }
 
+
 # ===========================================================================
 
 @B.post('/')
@@ -90,6 +105,7 @@ def root_post():
 
     return "ok"
 
+
 # ===========================================================================
 #
 # Main applications script

Docker/src/conf/eagle.py

@@ -23,6 +23,9 @@ mqttPrice = 'power/elec/Home/price'
 #Current rate label (returns rate label from meter)
 mqttRateLabel = 'power/elec/Home/ratelabel'
 
+#Network Info Topic (returns status, description and link strength from meter)
+mqttNetwork = 'power/elec/Home/network'
+
 #===========================================================================
 #
 # Logging configuration.  Env variables are allowed in the file name.

README.md

@@ -1,22 +1,20 @@
 # py-eagle-mqtt
+
 Python3 based Docker for Eagle to MQTT reader
 
-I have only ported this into a dockerfile, All Original code (with one minor modification for XML root tag) is credit to [Ted Drain - TD22057](https://github.com/TD22057/T-Home).
+I have only ported this into a dockerfile, as well as made some changes to code for security or other purposes. All Original code is credit to [Ted Drain - TD22057](https://github.com/TD22057/T-Home).
+
+This project utilizes the following tools:
+
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/evanrich/py-eagle-mqtt)]()
+[![Gitlab pipeline status (self-hosted)](https://img.shields.io/gitlab/pipeline/erichardson/py-eagle-mqtt/master?gitlab_url=https%3A%2F%2Fgitlab.evanrichardsonphotography.com)]()
+[![Docker Pulls](https://img.shields.io/docker/pulls/evanrich/py-eagle-mqtt)]()
+[![Docker Image Version (latest by date)](https://img.shields.io/docker/v/evanrich/py-eagle-mqtt)]()
 
 ## UPDATES:
 
-2020-04-03: I've moved the repo to my private Gitlab server, with a mirror set up to github.  I did this so that I could easily integrate a CI/CD pipeline to build this image, as well as run some Security tools against the image to improve it's code quality.   Please continue to open bug reports/issues/pull requests here in Github.  Also swapped to defusedxml python module due to security issues around xmltree.  Forgot to incrememnt the build number, but docker container  latest is up-to-date.
-   
-2019-07-24: Rebase to python 3.7.4-alpine3.10, update bottle to 0.12.17
-
-2019-04-12: Rebase to python 3.7.3-alpine3.9
-
-2019-03-08: Rebase to python 3.7.2-alpine3.9, update bottle and astral versions to latest
-
-2019-01-03: Rebase to python 3.7.2-alpine3.8, changed logging level to Info (should output to /var/log/tHome/eagle.log)
-
-2018-09-10: Ported to Python3, Added pricing info.  Merged into master branch
-
+2020-04-06: Moved Updates to a CHANGELOG.md file to clean this up.
 
 ## Usage
 

sonar-project.properties

@@ -0,0 +1,3 @@
+sonar.projectKey=erichardson_py-eagle-mqtt_AXkgI9tRLcemhRz3NCjo
+sonar.qualitygate.wait=true
+sonar.projectBaseDir=Docker/src