Merge pull request #63 from anclrii/dev-2.0.0

Dev 2.0.0

.github/workflows/docker-publish.yml

@@ -8,7 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Run tests
+      - name: Install pip requirements
+        run: pip install --no-cache-dir -r requirements.txt -r requirements_tests.txt
+      - name: Run flake8 lint
+        run: flake8
+      - name: Run unit tests
+        run: pytest -v tests/
+      - name: Test docker build
         run: docker build . --file Dockerfile
   push:
     needs: test
@@ -20,7 +26,8 @@ jobs:
           fetch-depth: '0'
       - name: Bump version and push tag
         id: bumpVersion
-        uses: anothrNick/[email protected]
+        # uses: anothrNick/[email protected]
+        uses: alexeyatbluescape/github-tag-action@bugfix/semver-empty-results
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEFAULT_BUMP: patch

.gitignore

@@ -1,2 +1,3 @@
 .vscode
 venv
+__pycache__

Dockerfile

@@ -4,7 +4,7 @@ COPY requirements.txt /
 RUN pip install --no-cache-dir -r /requirements.txt
 
 RUN mkdir -p /app
-COPY storj-exporter.py /app
+ADD storj_exporter /app
 WORKDIR /app
 ENV STORJ_HOST_ADDRESS=storagenode STORJ_API_PORT=14002 STORJ_EXPORTER_PORT=9651
-CMD [ "python", "./storj-exporter.py" ]
+CMD [ "python", "./" ]

README.md

@@ -43,13 +43,12 @@ In this example `storagenode1, storagenode2, storagenode3` are the names of stor
 ##### Install package dependencies
 
     Dependencies: python3 python3-pip
-    pip3 install prometheus_client
+    pip3 install --no-cache-dir -r /requirements.txt
 
-##### Move storj_exporter to binary directory
+##### Move storj_exporter directory to a desired location
 
-    mv Storj-Exporter/storj-exporter.py /usr/local/bin/
-    chown storj_exporter:storj_exporter /usr/local/bin/storj-exporter.py
-    chmod +x /usr/local/bin/storj-exporter.py
+    mv storj_exporter/ /opt/
+    chown storj_exporter:storj_exporter /opt/storj_exporter/
 
 ##### Install systemd service and set to start on boot
 
@@ -60,7 +59,7 @@ In this example `storagenode1, storagenode2, storagenode3` are the names of stor
 
 ##### Standalone script
 
-    python3 storj-exporter.py
+    python3 /path/to/storj_exporter/
 
 ## Installing full monitoring stack (Prometheus + Grafana + Dashboard)
 

requirements_tests.txt

@@ -0,0 +1,3 @@
+flake8
+pytest
+requests-mock

storj_exporter.service

@@ -7,7 +7,7 @@ After=docker.service
 User=storj_exporter
 Group=storj_exporter
 Type=simple
-ExecStart=/usr/bin/python3 /usr/local/bin/storj-exporter.py
+ExecStart=/usr/bin/python3 /opt/storj_exporter/
 Restart=on-failure
 RestartSec=5s
 

storj_exporter/__init__.py

@@ -0,0 +1,3 @@
+import os
+import sys
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))