upgraded and restructured

more test files added updated with ldapsearch functionalities
MarshallWace · Sep 23, 2022 · 056c81a · 056c81a
1 parent 895c7c6
commit 056c81a
Show file tree

Hide file tree

Showing 49 changed files with 2,223 additions and 1,161 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,11 @@
+bin
+contrib
+.gitignore
+.dockerignore
+CHANGELOG.md
+DEVELOPMENT.md
+Dockerfile
+Jenkinfile
+LICENCE
+Makefile
+README.md
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 bin/
 go/
 *.snap
+vendor
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -7,7 +7,7 @@ commands.
 ## Install Go from source
 
 ```bash
-export VERSION=1.15 OS=linux ARCH=amd64
+export VERSION=1.17 OS=linux ARCH=amd64
 wget https://dl.google.com/go/go$VERSION.$OS-$ARCH.tar.gz
 tar -xzvf go$VERSION.$OS-$ARCH.tar.gz
 export PATH=$PWD/go/bin:$PATH

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ go/modules/pkg/mod: go.mod
 
 .PHONY: test
 test: go/modules/pkg/mod $(GOFILES)
-	go test -v
+	go test -v ./...
 
 run: $(GOBIN)
 	$(GOBIN)

diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 Prometheus collector and exporter for metrics extracted from the [Slurm](https://slurm.schedmd.com/overview.html) resource scheduling system.
 
+> This work use https://github.com/vpenso/prometheus-slurm-exporter as starting point
+
 ## Exported Metrics
 
 ### State of the CPUs

diff --git a/accounts.go b/accounts.go
diff --git a/images/Job_Status.png → contrib/images/Job_Status.png b/images/Job_Status.png → contrib/images/Job_Status.png
diff --git a/images/Node_Status.png → contrib/images/Node_Status.png b/images/Node_Status.png → contrib/images/Node_Status.png
diff --git a/images/Scheduler_Info.png → contrib/images/Scheduler_Info.png b/images/Scheduler_Info.png → contrib/images/Scheduler_Info.png
diff --git a/...systemd/prometheus-slurm-exporter.service → ...systemd/prometheus-slurm-exporter.service b/...systemd/prometheus-slurm-exporter.service → ...systemd/prometheus-slurm-exporter.service
diff --git a/packages/README.md → contrib/packages/README.md b/packages/README.md → contrib/packages/README.md
diff --git a/packages/rpm/README.md → contrib/packages/rpm/README.md b/packages/rpm/README.md → contrib/packages/rpm/README.md
diff --git a/packages/rpm/prometheus-slurm-exporter.spec → ...ckages/rpm/prometheus-slurm-exporter.spec b/packages/rpm/prometheus-slurm-exporter.spec → ...ckages/rpm/prometheus-slurm-exporter.spec
diff --git a/packages/snap/README.md → contrib/packages/snap/README.md b/packages/snap/README.md → contrib/packages/snap/README.md
diff --git a/snap/snapcraft.yaml → contrib/snap/snapcraft.yaml b/snap/snapcraft.yaml → contrib/snap/snapcraft.yaml
diff --git a/go.mod b/go.mod
@@ -1,9 +1,26 @@
 module github.com/vpenso/prometheus-slurm-exporter
 
-go 1.12
+go 1.17
 
 require (
-	github.com/prometheus/client_golang v1.2.1
-	github.com/prometheus/common v0.7.0
-	github.com/stretchr/testify v1.3.0
+	github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3
+	github.com/prometheus/client_golang v1.13.0
+	github.com/stretchr/testify v1.4.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.4.1 // indirect
+	github.com/go-ldap/ldap/v3 v3.1.7 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     bin/
     go/
     *.snap
+    vendor