Merge pull request #22 from ExamonHPC/release/v0.4.0

Release v0.4.0

Author: fbeneventi

.github/workflows/installation-test.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Docker
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Create Docker services
         run: |

.gitignore

@@ -2,7 +2,6 @@
 *.log.*
 *.pyc
 .ipynb_* 
-examon-cache/
-examon-cache/*
+examon-cache
 build
 site

Dockerfile

@@ -1,52 +1,35 @@
-FROM examonhpc/examon:0.2.0
+FROM examonhpc/examon:0.3.3
 
 ENV EXAMON_HOME /etc/examon_deploy/examon
 
-# Create a backup of the existing sources.list
-RUN mv /etc/apt/sources.list /etc/apt/sources.list.backup
-
-# Create a new sources.list file
-RUN touch /etc/apt/sources.list
-
-# Debian strech moved to archived
-RUN echo "deb https://debian.mirror.garr.it/debian-archive/ stretch main" > /etc/apt/sources.list
-
-
-# Install dependencies
-RUN apt-get update && apt-get install -y \
-    apt-transport-https \
-    ca-certificates \
-    libffi-dev \
-    build-essential \
-    libssl-dev \
-    python-dev \
-	&& rm -rf /var/lib/apt/lists/*
-
-# copy app
+# Copy app
 ADD ./publishers/random_pub ${EXAMON_HOME}/publishers/random_pub
-ADD ./lib/examon-common $EXAMON_HOME/lib/examon-common
 ADD ./docker/examon/supervisor.conf /etc/supervisor/conf.d/supervisor.conf
 ADD ./scripts/examon.conf $EXAMON_HOME/scripts/examon.conf
 ADD ./web $EXAMON_HOME/web
 
-# install
-RUN pip --trusted-host pypi.python.org install --upgrade pip==20.1.1
+# Venvs
+WORKDIR $EXAMON_HOME/scripts
+RUN virtualenv -p $(which python) py3_env
+
 ENV PIP $EXAMON_HOME/scripts/ve/bin/pip
+ENV S_PIP $EXAMON_HOME/scripts/py3_env/bin/pip
 
+# Install
 WORKDIR $EXAMON_HOME/lib/examon-common
-RUN $PIP install .
-RUN pip install .
+RUN $S_PIP install .
 
+# Random publisher
 WORKDIR $EXAMON_HOME/publishers/random_pub
 RUN $PIP install -r requirements.txt
 
+# Web
 WORKDIR $EXAMON_HOME/web
-RUN virtualenv flask
-RUN flask/bin/pip --trusted-host pypi.python.org install --upgrade pip==20.1.1
-RUN CASS_DRIVER_BUILD_CONCURRENCY=8 flask/bin/pip --trusted-host pypi.python.org install -r ./examon-server/requirements.txt
+RUN virtualenv -p $(which python) flask
+RUN CASS_DRIVER_BUILD_CONCURRENCY=8 flask/bin/pip install -r ./examon-server/requirements.txt
 
 WORKDIR $EXAMON_HOME/scripts
 
-EXPOSE 1883 9001
+EXPOSE 1883 5000 9001
 
 CMD ["./frontend_ctl.sh", "start"]

README.md

@@ -32,7 +32,7 @@ It can be disabled as described in the [Enable/disable plugins](#enabledisable-t
 ## Prerequisites
 Since Cassandra is the component that requires the majority of resources, you can find more details about the suggested hardware configuration of the system that will host the services here:
 
-[Hardware Configuration](https://cassandra.apache.org/doc/latest/operating/hardware.html#:~:text=While%20Cassandra%20can%20be%20made,at%20least%2032GB%20of%20RAM)
+[Hardware Configuration](https://cassandra.apache.org/doc/latest/cassandra/managing/operating/hardware.html)
 
 To install all the services needed by ExaMon we will use Docker and Docker Compose:
 

VERSION

@@ -1 +1 @@
-v0.3.1
+v0.4.0

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 name: "examon"
 
 networks:
@@ -11,11 +10,8 @@ services:
   examon:
     build:
       context: .
-    image: examonhpc/examon:0.2.2
+    image: examonhpc/examon:latest
     volumes:  
-      - type: bind
-        source: ./lib/examon-common
-        target: /etc/examon_deploy/examon/lib/examon-common
       - type: bind
         source: ./web/examon-server
         target: /etc/examon_deploy/examon/web/examon-server

docker/examon/supervisor.conf

@@ -23,7 +23,7 @@ startsec=2
 
 [program:random_pub]
 directory=/etc/examon_deploy/examon/publishers/random_pub
-command=python ./random_pub.py run
+command=/etc/examon_deploy/examon/scripts/ve/bin/python random_pub.py run
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/random_pub.log

docker/kairosdb/Dockerfile

@@ -2,15 +2,6 @@
 
 FROM adoptopenjdk:8-jre-hotspot-focal
 
-# Create a backup of the existing sources.list
-RUN mv /etc/apt/sources.list /etc/apt/sources.list.backup
-
-# Create a new sources.list file
-RUN touch /etc/apt/sources.list
-
-# Add the new server repository for focal packages
-RUN echo "deb https://ubuntu.mirror.garr.it/ubuntu/ focal main" > /etc/apt/sources.list
-
 RUN set -eux; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \

docs/Administrators/Getting_started.md

@@ -9,7 +9,7 @@ This setup will install all server-side components of the ExaMon framework:
 ## Prerequisites
 Since Cassandra is the component that requires the majority of resources, you can find more details about the suggested hardware configuration of the system that will host the services here:
 
-[Hardware Configuration](https://cassandra.apache.org/doc/latest/operating/hardware.html#:~:text=While%20Cassandra%20can%20be%20made,at%20least%2032GB%20of%20RAM)
+[Hardware Configuration](https://cassandra.apache.org/doc/latest/cassandra/managing/operating/hardware.html)
 
 To install all the services needed by ExaMon we will use Docker and Docker Compose:
 

docs/Plugins/examon_pub.ipynb

@@ -6,12 +6,12 @@
    "metadata": {},
    "source": [
     "# Example plugin\n",
-    "This notebook shows how to create a simple Examon publisher using Python (v3)\n",
+    "This notebook shows how to create a simple Examon publisher using Python.\n",
     "\n",
     "## Install \n",
-    "Install the publisher library.\n",
+    "Install the latest Examon publisher library.\n",
     "\n",
-    "NOTE: This is a development release so the final API may be different in future versions."
+    "https://github.com/ExamonHPC/examon-common\n"
    ]
   },
   {
@@ -23,7 +23,7 @@
    },
    "outputs": [],
    "source": [
-    "! python -m pip install --upgrade https://github.com/fbeneventi/releases/releases/latest/download/examon-common-py3.zip"
+    "! python -m pip install --upgrade git+https://github.com/ExamonHPC/examon-common.git@master"
    ]
   },
   {