update Github actions

inovex · Aug 30, 2023 · 33461af · 33461af
1 parent f79be94
commit 33461af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/build_and_test.yml b/.github/workflows/build.yml → .github/workflows/build_and_test.yml
@@ -1,14 +1,13 @@
-name: Build and Release Binaries
+name: Build, Test and Release Binaries
 
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -18,8 +17,17 @@ jobs:
         with:
           go-version: 1.21
 
+      - name: Extract EXPORTER_VERSION
+        id: extract_exporter_version
+        run: echo "::set-output name=version::$(cat VERSION)"
+
+      - name: Run Tests
+        run: go test ./...
+
       - name: Run Goreleaser
         if: ${{ github.event_name != 'pull_request' }}
+        env:
+          EXPORTER_VERSION: ${{ steps.extract_exporter_version.outputs.version }}
         uses: goreleaser/goreleaser-action@v3
         with:
           version: latest

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 build
 dist
-/vendor
+.vscode
diff --git a/pkg/exporter/prometheus-libvirt-exporter.go b/pkg/exporter/prometheus-libvirt-exporter.go
@@ -105,12 +105,12 @@ var (
 		[]string{"domain", "instanceName", "instanceId", "flavorName", "userName", "userId", "projectName", "projectId", "host", "source_file", "target_device"},
 		nil)
 	libvirtDomainBlockWrTimeDesc = prometheus.NewDesc(
-		prometheus.BuildFQName("libvirt", "domain_block_stats", "write_time_total"),
+		prometheus.BuildFQName(namespace, "domain_block_stats", "write_time_total"),
 		"Total duration of write requests from a block device. (ns)",
 		[]string{"domain", "instanceName", "instanceId", "flavorName", "userName", "userId", "projectName", "projectId", "host", "source_file", "target_device"},
 		nil)
 	libvirtDomainBlockRdTimeDesc = prometheus.NewDesc(
-		prometheus.BuildFQName("libvirt", "domain_block_stats", "read_time_total"),
+		prometheus.BuildFQName(namespace, "domain_block_stats", "read_time_total"),
 		"Total duration of read requests from a block device. (ns)",
 		[]string{"domain", "instanceName", "instanceId", "flavorName", "userName", "userId", "projectName", "projectId", "host", "source_file", "target_device"},
 		nil)