diff --git a/.github/workflows/Prometheus Integration Test.yml b/.github/workflows/Prometheus Integration Test.yml deleted file mode 100644 index 73a2a07..0000000 --- a/.github/workflows/Prometheus Integration Test.yml +++ /dev/null @@ -1,33 +0,0 @@ -# This workflow will build a golang project -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go - -name: Prometheus Integration Test - -on: - push: - branches: [ "main" ] - paths: - - cmd/collector/** - pull_request: - branches: [ "main" ] - paths: - - cmd/collector/** - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.22.9' - - # - name: Build - # run: go build -v ./cmd/collector/ - - - name: Test - working-directory: ./cmd/collector/ - run: go test -v diff --git a/.github/workflows/ci-collector.yaml b/.github/workflows/ci-prometheus-metrics.yaml similarity index 76% rename from .github/workflows/ci-collector.yaml rename to .github/workflows/ci-prometheus-metrics.yaml index 44e80b3..1f1d439 100644 --- a/.github/workflows/ci-collector.yaml +++ b/.github/workflows/ci-prometheus-metrics.yaml @@ -1,5 +1,5 @@ -name: CI Collector Workflow -run-name: Building Collector by @${{ github.actor }} +name: CI Prometheus Metrics Workflow +run-name: Building Prometheus Metrics by @${{ github.actor }} on: workflow_dispatch: @@ -7,7 +7,7 @@ on: branches: - main paths: - - 'cmd/collector/**' + - 'cmd/prometheus_metrics/**' jobs: build: runs-on: ubuntu-latest @@ -33,7 +33,7 @@ jobs: id: docker-metadata uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository }}/collector + images: ghcr.io/${{ github.repository }}/prometheus-metrics tags: | type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}}.{{patch}} @@ -44,9 +44,8 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker-metadata.outputs.tags }} labels: ${{ steps.docker-metadata.outputs.labels }} - context: cmd/collector - file: cmd/collector/Dockerfile + context: cmd/prometheus_metrics + file: cmd/prometheus_metrics/Dockerfile platforms: linux/amd64,linux/arm64 - cache-from: type=registry,ref=ghcr.io/${{ github.repository }}/collector:cache - cache-to: type=registry,image-manifest=true,oci-mediatypes=true,ref=ghcr.io/${{ github.repository }}/collector:cache,mode=max - \ No newline at end of file + cache-from: type=registry,ref=ghcr.io/${{ github.repository }}/prometheus-metrics:cache + cache-to: type=registry,image-manifest=true,oci-mediatypes=true,ref=ghcr.io/${{ github.repository }}/prometheus-metrics:cache,mode=max \ No newline at end of file diff --git a/.github/workflows/prometheus-metrics-test.yml b/.github/workflows/prometheus-metrics-test.yml new file mode 100644 index 0000000..4f82c6a --- /dev/null +++ b/.github/workflows/prometheus-metrics-test.yml @@ -0,0 +1,27 @@ +name: Prometheus Metrics Integration Test + +on: + push: + branches: [ "main" ] + paths: + - cmd/prometheus_metrics/** + pull_request: + branches: [ "main" ] + paths: + - cmd/prometheus_metrics/** + +jobs: + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: '1.22.9' + + - name: Test + working-directory: ./cmd/prometheus_metrics/ + run: go test -v \ No newline at end of file diff --git a/cmd/collector/Dockerfile b/cmd/prometheus_metrics/Dockerfile similarity index 54% rename from cmd/collector/Dockerfile rename to cmd/prometheus_metrics/Dockerfile index a30a735..96210c1 100644 --- a/cmd/collector/Dockerfile +++ b/cmd/prometheus_metrics/Dockerfile @@ -17,18 +17,18 @@ RUN go mod download COPY . . # Build the application -RUN go build -o collector +RUN go build -o prometheus-metrics # Stage 2: Create a lightweight production image FROM alpine:latest -# Install runtime dependencies and create a collector user +# Install runtime dependencies and create a prometheus-metrics user RUN apk --no-cache add ca-certificates && \ - addgroup -S collector && adduser -S collector -G collector + addgroup -S prometheus-metrics && adduser -S prometheus-metrics -G prometheus-metrics WORKDIR / -COPY --from=builder /app/collector . -RUN chown collector:collector /collector +COPY --from=builder /app/prometheus-metrics . +RUN chown prometheus-metrics:prometheus-metrics /prometheus-metrics -USER collector -CMD ["./collector"] +USER prometheus-metrics +CMD ["./prometheus-metrics"] \ No newline at end of file diff --git a/cmd/collector/collector_test.go b/cmd/prometheus_metrics/collector_test.go similarity index 100% rename from cmd/collector/collector_test.go rename to cmd/prometheus_metrics/collector_test.go diff --git a/cmd/collector/go.mod b/cmd/prometheus_metrics/go.mod similarity index 100% rename from cmd/collector/go.mod rename to cmd/prometheus_metrics/go.mod diff --git a/cmd/collector/go.sum b/cmd/prometheus_metrics/go.sum similarity index 100% rename from cmd/collector/go.sum rename to cmd/prometheus_metrics/go.sum diff --git a/cmd/collector/main.go b/cmd/prometheus_metrics/main.go similarity index 100% rename from cmd/collector/main.go rename to cmd/prometheus_metrics/main.go diff --git a/cmd/collector/record_metrics.go b/cmd/prometheus_metrics/record_metrics.go similarity index 100% rename from cmd/collector/record_metrics.go rename to cmd/prometheus_metrics/record_metrics.go