chore: Rename package to batchjob_metrics_monitor

Signed-off-by: Mahendra Paipuri <[email protected]>

.circleci/config.yml

@@ -53,7 +53,7 @@ jobs:
           destination: /build
 workflows:
   version: 2
-  batchjob_monitoring:
+  batchjob_metrics_monitor:
     jobs:
       - test:
           filters:

.promu-cgo.yml

@@ -4,7 +4,7 @@ go:
     version: 1.21
     cgo: true
 repository:
-    path: github.com/mahendrapaipuri/batchjob_monitoring
+    path: github.com/mahendrapaipuri/batchjob_metrics_monitor
 build:
     binaries:
         - name: batchjob_stats_server

.promu-go.yml

@@ -3,7 +3,7 @@ go:
     # .promu-cgo.yml should also be updated.
     version: 1.21
 repository:
-    path: github.com/mahendrapaipuri/batchjob_monitoring
+    path: github.com/mahendrapaipuri/batchjob_metrics_monitor
 build:
     binaries:
         - name: batchjob_exporter

.promu.yml

@@ -3,7 +3,7 @@ go:
     # .promu-cgo.yml should also be updated.
     version: 1.21
 repository:
-    path: github.com/mahendrapaipuri/batchjob_monitoring
+    path: github.com/mahendrapaipuri/batchjob_metrics_monitor
 build:
     binaries:
         - name: batchjob_exporter

CHANGELOG.md

@@ -2,24 +2,24 @@
 
 ## 0.1.0-rc.2 / 2023-12-26
 
-- [REFACTOR] Refactor jobstats pkg [#18](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/18) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [REFACTOR] Use default http client for requests for emissions collector [#16](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/16) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [REFACTOR] Refactor emissions pkg [#16](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/16) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [BUGFIX] bugfix: Correctly parse SLURM nodelist range string [#15](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/15) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [REFACTOR] Refactor jobstats pkg [#18](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/18) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [REFACTOR] Use default http client for requests for emissions collector [#16](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/16) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [REFACTOR] Refactor emissions pkg [#16](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/16) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [BUGFIX] bugfix: Correctly parse SLURM nodelist range string [#15](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/15) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
 
 ## 0.1.0-rc.1 / 2023-12-20
 
-- [FEATURE] Bug fixes and refactoring [#14](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/14) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Misc improvements [#13](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/13) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Merge job stats DB and server commands [#12](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/12) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Support GPU jobID map from /proc [#11](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/11) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Add Runtime pkg [#10](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/10) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Misc features [#9](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/9) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Add API server to serve job stats [#8](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/8) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Add jobstats pkg [#7](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/7) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Use pkg structure [#6](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/6) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Use UID and GID to job labels [#5](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/5) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Reorganise repo [#4](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/4) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Add unique jobid label for SLURM jobs [#3](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/3) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] Add Emission collector [#2](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/2) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
-- [FEATURE] CircleCI setup [#1](https://github.com/mahendrapaipuri/batchjob_monitoring/pull/1) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Bug fixes and refactoring [#14](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/14) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Misc improvements [#13](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/13) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Merge job stats DB and server commands [#12](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/12) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Support GPU jobID map from /proc [#11](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/11) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Add Runtime pkg [#10](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/10) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Misc features [#9](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/9) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Add API server to serve job stats [#8](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/8) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Add jobstats pkg [#7](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/7) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Use pkg structure [#6](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/6) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Use UID and GID to job labels [#5](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/5) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Reorganise repo [#4](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/4) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Add unique jobid label for SLURM jobs [#3](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/3) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] Add Emission collector [#2](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/2) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))
+- [FEATURE] CircleCI setup [#1](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/pull/1) ([@mahendrapaipuri](https://github.com/mahendrapaipuri))

README.md

@@ -92,7 +92,7 @@ populate the local DB.
 ### Install
 
 Pre-compiled binaries of the apps can be downloaded from the 
-[releases](https://github.com/mahendrapaipuri/batchjob_monitoring/releases/).
+[releases](https://github.com/mahendrapaipuri/batchjob_metrics_monitor/releases/).
 
 ### Build
 

cmd/batchjob_exporter/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/mahendrapaipuri/batchjob_monitoring/pkg/collector"
+import "github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/collector"
 
 // Main entry point for `batchjob_exporter` app
 func main() {

cmd/batchjob_stats_server/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/cli"
+import "github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/cli"
 
 // Main entry point for `batchjob_stats_server` app
 func main() {

examples/mock_exporter/cmd/mock_exporter/main.go

@@ -3,8 +3,8 @@ package main
 
 // Ensure to import the current mock collector
 import (
-	_ "github.com/mahendrapaipuri/batchjob_monitoring/examples/mock_exporter/pkg/collector"
-	batchjob_collector "github.com/mahendrapaipuri/batchjob_monitoring/pkg/collector"
+	_ "github.com/mahendrapaipuri/batchjob_metrics_monitor/examples/mock_exporter/pkg/collector"
+	batchjob_collector "github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/collector"
 )
 
 // Main entry point for `batchjob_exporter` app

examples/mock_exporter/pkg/collector/mock_metric.go

@@ -4,7 +4,7 @@ import (
 	"math/rand"
 
 	"github.com/go-kit/log"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/collector"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/collector"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

examples/mock_scheduler/cmd/mock_scheduler/main.go

@@ -3,8 +3,8 @@ package main
 
 // Ensure to import the current mock scheduler
 import (
-	_ "github.com/mahendrapaipuri/batchjob_monitoring/examples/mock_scheduler/pkg/scheduler"
-	batchjob_stats_cli "github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/cli"
+	_ "github.com/mahendrapaipuri/batchjob_metrics_monitor/examples/mock_scheduler/pkg/scheduler"
+	batchjob_stats_cli "github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/cli"
 )
 
 // Main entry point for `batchjob_stats_server` app

examples/mock_scheduler/pkg/scheduler/mock_scheduler.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/schedulers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/schedulers"
 )
 
 type mockScheduler struct {

go.mod

@@ -1,4 +1,4 @@
-module github.com/mahendrapaipuri/batchjob_monitoring
+module github.com/mahendrapaipuri/batchjob_metrics_monitor
 
 go 1.21
 

pkg/collector/cli.go

@@ -11,7 +11,7 @@ import (
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	batchjob_runtime "github.com/mahendrapaipuri/batchjob_monitoring/internal/runtime"
+	batchjob_runtime "github.com/mahendrapaipuri/batchjob_metrics_monitor/internal/runtime"
 	"github.com/prometheus/client_golang/prometheus"
 	promcollectors "github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/common/promlog"

pkg/collector/emissions.go

@@ -13,7 +13,7 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/emissions"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/emissions"
 )
 
 const emissionsCollectorSubsystem = "emissions"

pkg/collector/emissions_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/go-kit/log"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/emissions"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/emissions"
 )
 
 var (

pkg/collector/helper.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/mahendrapaipuri/batchjob_monitoring/internal/helpers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/internal/helpers"
 )
 
 type Device struct {

pkg/collector/ipmi.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/mahendrapaipuri/batchjob_monitoring/internal/helpers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/internal/helpers"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

pkg/collector/slurm.go

@@ -20,7 +20,7 @@ import (
 	"github.com/containerd/cgroups/v3/cgroup2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/mahendrapaipuri/batchjob_monitoring/internal/helpers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/internal/helpers"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/procfs"
 )

pkg/jobstats/base/base.go

@@ -2,7 +2,7 @@ package base
 
 import (
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/helper"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/helper"
 )
 
 // Name of batchjob_stats_server kingpin app

pkg/jobstats/cli/cli.go

@@ -17,11 +17,11 @@ import (
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log/level"
-	batchjob_runtime "github.com/mahendrapaipuri/batchjob_monitoring/internal/runtime"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/db"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/schedulers"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/server"
+	batchjob_runtime "github.com/mahendrapaipuri/batchjob_metrics_monitor/internal/runtime"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/db"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/schedulers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/server"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/common/promlog"
 	"github.com/prometheus/common/promlog/flag"

pkg/jobstats/db/db.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/schedulers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/schedulers"
 	_ "github.com/mattn/go-sqlite3"
 )
 

pkg/jobstats/db/db_test.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/schedulers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/schedulers"
 	_ "github.com/mattn/go-sqlite3"
 )
 

pkg/jobstats/schedulers/schedulers.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
 )
 
 // BatchJobFetcher is the interface batch scheduler has to implement.

pkg/jobstats/schedulers/slurm.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/mahendrapaipuri/batchjob_monitoring/internal/helpers"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/helper"
-	jobstats_helper "github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/helper"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/internal/helpers"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/helper"
+	jobstats_helper "github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/helper"
 )
 
 type slurmScheduler struct {

pkg/jobstats/schedulers/slurm_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/go-kit/log"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
 )
 
 var (

pkg/jobstats/server/server.go

@@ -16,8 +16,8 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/gorilla/mux"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/db"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/db"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/prometheus/exporter-toolkit/web"
 )

pkg/jobstats/server/server_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/go-kit/log"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/base"
-	"github.com/mahendrapaipuri/batchjob_monitoring/pkg/jobstats/db"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/base"
+	"github.com/mahendrapaipuri/batchjob_metrics_monitor/pkg/jobstats/db"
 )
 
 func setupServer() *JobstatsServer {

scripts/e2e-test.sh

@@ -5,7 +5,7 @@ set -euf -o pipefail
 cd "$(dirname $0)/.."
 
 port="$((10000 + (RANDOM % 10000)))"
-tmpdir=$(mktemp -d /tmp/batchjob_monitoring_e2e_test.XXXXXX)
+tmpdir=$(mktemp -d /tmp/batchjob_metrics_monitor_e2e_test.XXXXXX)
 
 skip_re="^(go_|batchjob_exporter_build_info|batchjob_scrape_collector_duration_seconds|process_|batchjob_textfile_mtime_seconds|batchjob_time_(zone|seconds)|batchjob_network_(receive|transmit)_(bytes|packets)_total)"