Skip to content

Commit

Permalink
Set metrics prefix for piped and pipecd metrics (#2255)
Browse files Browse the repository at this point in the history
**What this PR does / why we need it**:

**Which issue(s) this PR fixes**:

Fixes #

**Does this PR introduce a user-facing change?**:
<!--
If no, just write "NONE" in the release-note block below.
-->
```release-note
NONE
```

This PR was merged by Kapetanios.
  • Loading branch information
khanhtc1202 committed Jul 15, 2021
1 parent e054f18 commit d006e5e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion cmd/pipecd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,6 @@ func createFilestore(ctx context.Context, cfg *config.ControlPlaneSpec, logger *
}

func registerMetrics() {
r := prometheus.DefaultRegisterer
r := prometheus.WrapRegistererWithPrefix("pipecd", prometheus.DefaultRegisterer)
cachemetrics.Register(r)
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const (
var (
toolCallsCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "piped_cloudprovider_kubernetes_tool_calls_total",
Name: "cloudprovider_kubernetes_tool_calls_total",
Help: "Number of calls made to run the tool like kubectl, kustomize.",
},
[]string{
Expand Down
15 changes: 9 additions & 6 deletions pkg/app/piped/cmd/piped/piped.go
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,15 @@ func (p *piped) getConfigDataFromSecretManager(ctx context.Context) ([]byte, err

func registerMetrics(pipedID string) *prometheus.Registry {
r := prometheus.NewRegistry()
wrapped := prometheus.WrapRegistererWith(
prometheus.Labels{
"piped": pipedID,
"piped_version": version.Get().Version,
},
r,
wrapped := prometheus.WrapRegistererWithPrefix(
"piped",
prometheus.WrapRegistererWith(
prometheus.Labels{
"piped": pipedID,
"piped_version": version.Get().Version,
},
r,
),
)
wrapped.Register(prometheus.NewGoCollector())
wrapped.Register(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const (
var (
apiRequestsCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "piped_livestatestore_kubernetes_api_requests_total",
Name: "livestatestore_kubernetes_api_requests_total",
Help: "Number of requests sent to kubernetes api server.",
},
[]string{
Expand All @@ -56,7 +56,7 @@ var (
)
resourceEventsCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "piped_livestatestore_kubernetes_resource_events_total",
Name: "livestatestore_kubernetes_resource_events_total",
Help: "Number of resource events received from kubernetes server.",
},
[]string{
Expand Down
2 changes: 1 addition & 1 deletion pkg/cache/cachemetrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const (
var (
getCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "pipecd_cache_get_operation_total",
Name: "cache_get_operation_total",
Help: "Number of cache get operation while processing",
},
[]string{
Expand Down

0 comments on commit d006e5e

Please sign in to comment.