Merge pull request kubevirt#10962 from machadovilaca/update-monitorin…

…g-file-struct Update monitoring file structure
bnabholz · Jan 10, 2024 · 2654145 · 2654145
2 parents 1288f30 + ec20c88
commit 2654145
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/pkg/monitoring/virt-api/metrics/BUILD.bazel → pkg/monitoring/metrics/virt-api/BUILD.bazel b/pkg/monitoring/virt-api/metrics/BUILD.bazel → pkg/monitoring/metrics/virt-api/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
         "metrics.go",
         "vm_metrics.go",
     ],
-    importpath = "kubevirt.io/kubevirt/pkg/monitoring/virt-api/metrics",
+    importpath = "kubevirt.io/kubevirt/pkg/monitoring/metrics/virt-api",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/kubevirt.io/api/core/v1:go_default_library",

diff --git a/pkg/monitoring/virt-api/metrics/metrics.go → pkg/monitoring/metrics/virt-api/metrics.go b/pkg/monitoring/virt-api/metrics/metrics.go → pkg/monitoring/metrics/virt-api/metrics.go
@@ -17,7 +17,7 @@
  *
  */
 
-package metrics
+package virt_api
 
 import "github.com/machadovilaca/operator-observability/pkg/operatormetrics"
 

diff --git a/...monitoring/virt-api/metrics/vm_metrics.go → ...monitoring/metrics/virt-api/vm_metrics.go b/...monitoring/virt-api/metrics/vm_metrics.go → ...monitoring/metrics/virt-api/vm_metrics.go
@@ -17,7 +17,7 @@
  *
  */
 
-package metrics
+package virt_api
 
 import (
 	"github.com/machadovilaca/operator-observability/pkg/operatormetrics"

diff --git a/...oring/virt-controller/metrics/BUILD.bazel → ...oring/metrics/virt-controller/BUILD.bazel b/...oring/virt-controller/metrics/BUILD.bazel → ...oring/metrics/virt-controller/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
         "component_metrics.go",
         "metrics.go",
     ],
-    importpath = "kubevirt.io/kubevirt/pkg/monitoring/virt-controller/metrics",
+    importpath = "kubevirt.io/kubevirt/pkg/monitoring/metrics/virt-controller",
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics:go_default_library",

diff --git a/...t-controller/metrics/component_metrics.go → ...rics/virt-controller/component_metrics.go b/...t-controller/metrics/component_metrics.go → ...rics/virt-controller/component_metrics.go
@@ -1,4 +1,4 @@
-package metrics
+package virt_controller
 
 import (
 	"github.com/machadovilaca/operator-observability/pkg/operatormetrics"

diff --git a/...toring/virt-controller/metrics/metrics.go → ...toring/metrics/virt-controller/metrics.go b/...toring/virt-controller/metrics/metrics.go → ...toring/metrics/virt-controller/metrics.go
@@ -1,4 +1,4 @@
-package metrics
+package virt_controller
 
 import "github.com/machadovilaca/operator-observability/pkg/operatormetrics"
 

diff --git a/pkg/virt-api/BUILD.bazel b/pkg/virt-api/BUILD.bazel
@@ -9,8 +9,8 @@ go_library(
         "//pkg/certificates/bootstrap:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/healthz:go_default_library",
+        "//pkg/monitoring/metrics/virt-api:go_default_library",
         "//pkg/monitoring/profiler:go_default_library",
-        "//pkg/monitoring/virt-api/metrics:go_default_library",
         "//pkg/rest:go_default_library",
         "//pkg/rest/filter:go_default_library",
         "//pkg/service:go_default_library",

diff --git a/pkg/virt-api/api.go b/pkg/virt-api/api.go
@@ -60,8 +60,8 @@ import (
 	"kubevirt.io/kubevirt/pkg/certificates/bootstrap"
 	"kubevirt.io/kubevirt/pkg/controller"
 	"kubevirt.io/kubevirt/pkg/healthz"
+	metrics "kubevirt.io/kubevirt/pkg/monitoring/metrics/virt-api"
 	"kubevirt.io/kubevirt/pkg/monitoring/profiler"
-	"kubevirt.io/kubevirt/pkg/monitoring/virt-api/metrics"
 	mime "kubevirt.io/kubevirt/pkg/rest"
 	"kubevirt.io/kubevirt/pkg/rest/filter"
 	"kubevirt.io/kubevirt/pkg/service"

diff --git a/pkg/virt-api/webhooks/validating-webhook/admitters/BUILD.bazel b/pkg/virt-api/webhooks/validating-webhook/admitters/BUILD.bazel
@@ -30,7 +30,7 @@ go_library(
         "//pkg/downwardmetrics:go_default_library",
         "//pkg/hooks:go_default_library",
         "//pkg/instancetype:go_default_library",
-        "//pkg/monitoring/virt-api/metrics:go_default_library",
+        "//pkg/monitoring/metrics/virt-api:go_default_library",
         "//pkg/network/link:go_default_library",
         "//pkg/network/vmispec:go_default_library",
         "//pkg/storage/backend-storage:go_default_library",

diff --git a/pkg/virt-api/webhooks/validating-webhook/admitters/vms-admitter.go b/pkg/virt-api/webhooks/validating-webhook/admitters/vms-admitter.go
@@ -45,7 +45,7 @@ import (
 	cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 
 	"kubevirt.io/kubevirt/pkg/instancetype"
-	"kubevirt.io/kubevirt/pkg/monitoring/virt-api/metrics"
+	metrics "kubevirt.io/kubevirt/pkg/monitoring/metrics/virt-api"
 	webhookutils "kubevirt.io/kubevirt/pkg/util/webhooks"
 	"kubevirt.io/kubevirt/pkg/virt-api/webhooks"
 	virtconfig "kubevirt.io/kubevirt/pkg/virt-config"

diff --git a/pkg/virt-controller/watch/BUILD.bazel b/pkg/virt-controller/watch/BUILD.bazel
@@ -24,11 +24,11 @@ go_library(
         "//pkg/healthz:go_default_library",
         "//pkg/hooks:go_default_library",
         "//pkg/instancetype:go_default_library",
+        "//pkg/monitoring/metrics/virt-controller:go_default_library",
         "//pkg/monitoring/migration:go_default_library",
         "//pkg/monitoring/migrationstats:go_default_library",
         "//pkg/monitoring/perfscale:go_default_library",
         "//pkg/monitoring/profiler:go_default_library",
-        "//pkg/monitoring/virt-controller/metrics:go_default_library",
         "//pkg/monitoring/vmistats:go_default_library",
         "//pkg/monitoring/vmstats:go_default_library",
         "//pkg/network/namescheme:go_default_library",
@@ -127,7 +127,7 @@ go_test(
         "//pkg/apimachinery/patch:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/instancetype:go_default_library",
-        "//pkg/monitoring/virt-controller/metrics:go_default_library",
+        "//pkg/monitoring/metrics/virt-controller:go_default_library",
         "//pkg/network/sriov:go_default_library",
         "//pkg/network/vmispec:go_default_library",
         "//pkg/pointer:go_default_library",

diff --git a/pkg/virt-controller/watch/application.go b/pkg/virt-controller/watch/application.go
@@ -77,8 +77,8 @@ import (
 	"kubevirt.io/kubevirt/pkg/controller"
 	clusterutil "kubevirt.io/kubevirt/pkg/util/cluster"
 
+	metrics "kubevirt.io/kubevirt/pkg/monitoring/metrics/virt-controller"
 	"kubevirt.io/kubevirt/pkg/monitoring/perfscale"
-	"kubevirt.io/kubevirt/pkg/monitoring/virt-controller/metrics"
 	vmiprom "kubevirt.io/kubevirt/pkg/monitoring/vmistats" // import for prometheus metrics
 	vmprom "kubevirt.io/kubevirt/pkg/monitoring/vmstats"
 	"kubevirt.io/kubevirt/pkg/service"

diff --git a/pkg/virt-controller/watch/application_test.go b/pkg/virt-controller/watch/application_test.go
@@ -49,7 +49,7 @@ import (
 	cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 
 	"kubevirt.io/kubevirt/pkg/controller"
-	"kubevirt.io/kubevirt/pkg/monitoring/virt-controller/metrics"
+	metrics "kubevirt.io/kubevirt/pkg/monitoring/metrics/virt-controller"
 	"kubevirt.io/kubevirt/pkg/rest"
 	"kubevirt.io/kubevirt/pkg/storage/export/export"
 	"kubevirt.io/kubevirt/pkg/storage/snapshot"
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
      *
      */
-    package metrics
+    package virt_api
     import "github.com/machadovilaca/operator-observability/pkg/operatormetrics"
@@ Expand Down @@