From 1e7add4a323c0e59eb400468fe4d40157e5992f6 Mon Sep 17 00:00:00 2001 From: jason yang Date: Fri, 6 Oct 2023 01:36:40 +0000 Subject: [PATCH] rename the module Signed-off-by: jason yang --- .github/workflows/license-check.yml | 2 +- README.md | 4 ++-- go.mod | 2 +- internal/cgroup/cgroup.go | 2 +- internal/monitor/instance.go | 8 ++++---- internal/network/wrapper.go | 6 +++--- internal/push/push.go | 2 +- main.go | 6 +++--- storage/diskmetricstore_test.go | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml index a61b966..e24c594 100644 --- a/.github/workflows/license-check.yml +++ b/.github/workflows/license-check.yml @@ -24,4 +24,4 @@ jobs: - name: Install go-license run: go install github.com/google/go-licenses@latest - name: Check license - run: go-licenses check --include_tests github.com/jasonyangshadow/apptheus... \ No newline at end of file + run: go-licenses check --include_tests github.com/apptainer/apptheus... \ No newline at end of file diff --git a/README.md b/README.md index 19a448b..99c7e6e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A redesigned Prometheus Pushgateway for ephemeral and batch jobs. To provide a unified way of collecting the Apptainer stats data. We plan to employ the cgroup feature, which requires putting starter (starter-suid) program under a created sub cgroup so that container stats can be collected and visualized. -To collect the cgroup stats, we are planning to deeply custormize the [Pushgateway](https://github.com/jasonyangshadow/apptheus) tool, tailing features and adding additional security policy. We call this tool `Apptheus`, meaning Apptainer links to Prometheus. +To collect the cgroup stats, we are planning to deeply custormize the [Pushgateway](https://github.com/apptainer/apptheus) tool, tailing features and adding additional security policy. We call this tool `Apptheus`, meaning Apptainer links to Prometheus. > Note that this tool can be used for monitoring any programs, this tool comes from the development of one Apptainer RFE. @@ -26,7 +26,7 @@ GET /metrics ### Apptainer uses Apptheus ![workflow](doc/apptainer.png) -https://github.com/JasonYangShadow/apptheus/assets/2051711/b33c5f20-a030-4b91-a6a7-bc62fe1fc6b8 +https://github.com/apptainer/apptheus/assets/2051711/b33c5f20-a030-4b91-a6a7-bc62fe1fc6b8 ## Important Opts diff --git a/go.mod b/go.mod index 7086478..49a6f18 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jasonyangshadow/apptheus +module github.com/apptainer/apptheus go 1.21 diff --git a/internal/cgroup/cgroup.go b/internal/cgroup/cgroup.go index 6d754e1..943bfd9 100644 --- a/internal/cgroup/cgroup.go +++ b/internal/cgroup/cgroup.go @@ -6,7 +6,7 @@ import ( "bytes" "fmt" - "github.com/jasonyangshadow/apptheus/internal/cgroup/parser" + "github.com/apptainer/apptheus/internal/cgroup/parser" "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups/manager" "github.com/opencontainers/runc/libcontainer/configs" diff --git a/internal/monitor/instance.go b/internal/monitor/instance.go index be74be6..87b370a 100644 --- a/internal/monitor/instance.go +++ b/internal/monitor/instance.go @@ -6,12 +6,12 @@ import ( "bytes" "time" + "github.com/apptainer/apptheus/internal/cgroup" + "github.com/apptainer/apptheus/internal/cgroup/parser" + "github.com/apptainer/apptheus/internal/push" + "github.com/apptainer/apptheus/storage" "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/jasonyangshadow/apptheus/internal/cgroup" - "github.com/jasonyangshadow/apptheus/internal/cgroup/parser" - "github.com/jasonyangshadow/apptheus/internal/push" - "github.com/jasonyangshadow/apptheus/storage" ) type Instance struct { diff --git a/internal/network/wrapper.go b/internal/network/wrapper.go index d2b065e..1c4eaaa 100644 --- a/internal/network/wrapper.go +++ b/internal/network/wrapper.go @@ -11,11 +11,11 @@ import ( "strings" "time" + "github.com/apptainer/apptheus/internal/cgroup/parser" + "github.com/apptainer/apptheus/internal/monitor" + "github.com/apptainer/apptheus/storage" "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/jasonyangshadow/apptheus/internal/cgroup/parser" - "github.com/jasonyangshadow/apptheus/internal/monitor" - "github.com/jasonyangshadow/apptheus/storage" "github.com/prometheus/exporter-toolkit/web" "golang.org/x/sys/unix" "toolman.org/net/peercred" diff --git a/internal/push/push.go b/internal/push/push.go index fe3cade..1619bc0 100644 --- a/internal/push/push.go +++ b/internal/push/push.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "github.com/jasonyangshadow/apptheus/storage" + "github.com/apptainer/apptheus/storage" "github.com/prometheus/common/expfmt" ) diff --git a/main.go b/main.go index 59108db..08a03de 100644 --- a/main.go +++ b/main.go @@ -47,9 +47,9 @@ import ( dto "github.com/prometheus/client_model/go" promlogflag "github.com/prometheus/common/promlog/flag" - "github.com/jasonyangshadow/apptheus/internal/network" - "github.com/jasonyangshadow/apptheus/internal/util" - "github.com/jasonyangshadow/apptheus/storage" + "github.com/apptainer/apptheus/internal/network" + "github.com/apptainer/apptheus/internal/util" + "github.com/apptainer/apptheus/storage" "toolman.org/net/peercred" ) diff --git a/storage/diskmetricstore_test.go b/storage/diskmetricstore_test.go index 40d1478..ec5f5d2 100644 --- a/storage/diskmetricstore_test.go +++ b/storage/diskmetricstore_test.go @@ -35,7 +35,7 @@ import ( dto "github.com/prometheus/client_model/go" - "github.com/jasonyangshadow/apptheus/testutil" + "github.com/apptainer/apptheus/testutil" ) var (