Merge pull request #8 from BICEP-Pump/feature/integration-BICEP

Feature/integration bicep

Author: maldwg

.github/workflows/ghcr.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # Needed to push back to main
+          fetch-depth: 0 # Needed to read branch history and push VERSION updates
 
       - name: Lowercase IMAGE_NAME
         id: lowercase_image
@@ -34,43 +34,125 @@ jobs:
 
       - name: Calculate New Version
         id: versioning
+        shell: bash
         run: |
-          CURRENT_VER=$(cat VERSION)
-          BUMP_TYPE="patch"
-          TAG_SUFFIX=""
-          IS_RELEASE="false"
+          set -euo pipefail
+
+          normalize_version() {
+            local version="${1%%-*}"
+            IFS='.' read -r -a parts <<< "$version"
+
+            while [[ "${#parts[@]}" -lt 3 ]]; do
+              parts+=(0)
+            done
+
+            printf '%s.%s.%s\n' "${parts[0]}" "${parts[1]}" "${parts[2]}"
+          }
+
+          bump_version() {
+            local current="$1"
+            local part="$2"
+            local normalized
+            local major
+            local minor
+            local patch
+
+            normalized="$(normalize_version "$current")"
+            IFS='.' read -r major minor patch <<< "$normalized"
+
+            case "$part" in
+              major)
+                ((major += 1))
+                minor=0
+                patch=0
+                ;;
+              minor)
+                ((minor += 1))
+                patch=0
+                ;;
+              patch)
+                ((patch += 1))
+                ;;
+              *)
+                echo "Unsupported bump type: $part" >&2
+                exit 1
+                ;;
+            esac
+
+            printf '%s.%s.%s\n' "$major" "$minor" "$patch"
+          }
+
+          read_version() {
+            tr -d '[:space:]' < "$1"
+          }
+
+          read_version_from_ref() {
+            local ref="$1"
+            git show "${ref}:VERSION" | tr -d '[:space:]'
+          }
+
+          CURRENT_VER="$(read_version VERSION)"
+          NEW_VER="$CURRENT_VER"
+          DOCKER_TAG="$CURRENT_VER"
 
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
             SOURCE_BRANCH="${{ github.event.pull_request.head.ref }}"
-            if [[ "$SOURCE_BRANCH" == release/* ]]; then
-              BUMP_TYPE="major"
-            elif [[ "$SOURCE_BRANCH" == feature/* ]]; then
-              BUMP_TYPE="minor"
+            SOURCE_SHA="${{ github.event.pull_request.head.sha }}"
+            BUMP_TYPE="patch"
+
+            if [[ "$SOURCE_BRANCH" == "dev" ]]; then
+              if git cat-file -e "${SOURCE_SHA}:VERSION" 2>/dev/null; then
+                NEW_VER="$(read_version_from_ref "$SOURCE_SHA")"
+              fi
+            else
+              if [[ "$SOURCE_BRANCH" == release/* ]]; then
+                BUMP_TYPE="major"
+              elif [[ "$SOURCE_BRANCH" == feature/* ]]; then
+                BUMP_TYPE="minor"
+              fi
+
+              NEW_VER="$(bump_version "$CURRENT_VER" "$BUMP_TYPE")"
             fi
-            IS_RELEASE="true"
+
+            DOCKER_TAG="$NEW_VER"
           elif [[ "${{ github.ref_name }}" == "dev" ]]; then
-            # For dev branch, we might not always want to bump the file in the same way, 
-            # but user wants it to work similarly.
-            TAG_SUFFIX="-dev"
-            # We bump patch for dev by default
-            BUMP_TYPE="patch"
+            NEW_VER="$(bump_version "$CURRENT_VER" "patch")"
+            DOCKER_TAG="${NEW_VER}-dev"
+          else
+            NEW_VER="$(bump_version "$CURRENT_VER" "patch")"
+            DOCKER_TAG="$NEW_VER"
           fi
 
-          NEW_VER=$(python3 scripts/bump_version.py "$CURRENT_VER" "$BUMP_TYPE")
-          echo "NEW_VERSION=${NEW_VER}" >> $GITHUB_OUTPUT
-          echo "DOCKER_TAG=${NEW_VER}${TAG_SUFFIX}" >> $GITHUB_OUTPUT
-          echo "IS_RELEASE=${IS_RELEASE}" >> $GITHUB_OUTPUT
+          echo "NEW_VERSION=${NEW_VER}" >> "$GITHUB_OUTPUT"
+          echo "DOCKER_TAG=${DOCKER_TAG}" >> "$GITHUB_OUTPUT"
 
-      - name: Update VERSION file
-        # Only update the repository file for merges to main
-        if: github.event_name == 'pull_request' && github.event.pull_request.merged == true
+      - name: Apply VERSION file
+        shell: bash
         run: |
           echo "${{ steps.versioning.outputs.NEW_VERSION }}" > VERSION
+
+      - name: Commit VERSION file
+        if: |
+          (github.event_name == 'push' && github.ref_name == 'dev' && github.actor != 'github-actions[bot]') ||
+          (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          if git diff --quiet -- VERSION; then
+            exit 0
+          fi
+
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add VERSION
           git commit -m "Bump version to ${{ steps.versioning.outputs.NEW_VERSION }} [skip ci]"
-          git push origin main
+
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            git push origin HEAD:main
+          else
+            git push origin HEAD:dev
+          fi
 
       - name: Log in to the Container registry
         uses: docker/login-action@v2

Dockerfile

@@ -28,7 +28,7 @@ COPY --from=builder /app/build/bicep-metric-service .
 ENV METRIC_ENDPOINT=""
 ENV REGISTRATION_ENDPOINT=""
 ENV SCRAPE_INTERVAL=10
-ENV BATCH_SIZE=10
+ENV METRIC_EXPORT_MODE="core"
 ENV SERVICE_NAME="bicep-metric-service"
 ENV SERVICE_PORT=8080
 ENV SERVICE_IP="127.0.0.1"

README.md

@@ -11,7 +11,7 @@ High-performance C++ service to monitor containerized environments via cgroups v
 - **Direct Scraper**: Parses `/sys/fs/cgroup` files for precision CPU (`usage_usec`) and RAM (`memory.current`) metrics.
 - **Docker Mapping**: Resolves container IDs to names using the Docker Engine API.
 - **Self-Discovered IP**: Automatically detects its host/container IP for registration if not provided.
-- **Batched Exporter**: Efficiently buffers and pushes JSON metrics to a configurable endpoint.
+- **Flexible Exporter**: Can push JSON to a core API or Prometheus text payloads directly to a Pushgateway-compatible endpoint.
 - **Internal Healthcheck**: Simple HTTP `/health` server for orchestration.
 
 ## Configuration
@@ -20,19 +20,21 @@ All settings are managed via environment variables.
 | Variable | Description | Default |
 |----------|-------------|---------|
 | `METRIC_ENDPOINT` | HTTP URL for metrics submission | (required) |
-| `REGISTRATION_ENDPOINT` | HTTP URL for service discovery | (optional) |
-| `SCRAPE_INTERVAL` | Seconds between scrapes | `10` |
-| `BATCH_SIZE` | Metric count before pushing | `10` |
+| `METRIC_EXPORT_MODE` | `core` for JSON-to-backend, `prometheus` for Pushgateway text export | `core` |
+| `REGISTRATION_ENDPOINT` | HTTP URL for service discovery, for example `http://core:8000/metric-services/register` or `http://core:8000/metric-services/register/1` | (optional) |
+| `SCRAPE_INTERVAL` | Seconds between scrapes; each scrape is pushed immediately | `10` |
 | `SERVICE_NAME` | Name reported to registry | `bicep-metric-service` |
 | `SERVICE_PORT` | Healthcheck port | `8080` |
 | `SERVICE_IP` | Service IP address | (auto-detected) |
 
+When `METRIC_EXPORT_MODE=prometheus`, `METRIC_ENDPOINT` should point at a Pushgateway-compatible URL such as `http://host:9091/metrics/job/metric_service_host_1`.
+
 ## Development
 Build requirements: `CMake 3.15+`, `gcc/g++ (C++20)`, `libcurl`, `docker-compose`.
 
 ### Build & Test
 ```bash
-mkdir build && cd build
+mkdir -p build && cd build
 cmake -DBUILD_TESTS=ON ..
 make -j$(nproc)
 ./bicep_tests

VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

docker-compose.test.yaml

@@ -6,10 +6,10 @@ services:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     environment:
+      - METRIC_EXPORT_MODE=core
       - METRIC_ENDPOINT=http://mock-backend:5000/metrics
-      - REGISTRATION_ENDPOINT=http://mock-backend:5000/register
+      - REGISTRATION_ENDPOINT=http://mock-backend:5000/metric-services/register
       - SCRAPE_INTERVAL=2
-      - BATCH_SIZE=2
       - SERVICE_NAME=integration-test-service
       - SERVICE_PORT=8080
     depends_on:

docker-compose.yaml

@@ -1,7 +1,7 @@
 services:
   bicep-metric-service:
     build: .
-    image: ghcr.io/bicep-pump/bicep-metric-service:latest
+    image: ghcr.io/bicep-pump/metric-service:latest
     container_name: bicep-metric-service
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -10,10 +10,10 @@ services:
     cap_add:
       - SYS_ADMIN # Alternative to privileged if possible
     environment:
+      - METRIC_EXPORT_MODE=core
       - METRIC_ENDPOINT=http://your-backend-api/metrics
-      - REGISTRATION_ENDPOINT=http://your-backend-api/register
+      - REGISTRATION_ENDPOINT=http://your-backend-api/metric-services/register
       - SCRAPE_INTERVAL=5
-      - BATCH_SIZE=10
       - SERVICE_NAME=bicep-metric-service
       - SERVICE_PORT=8080
       - SERVICE_IP=127.0.0.1 # Should be set to container IP or host reachable IP