Skip to content

Commit

Permalink
internal/cmd: add build info metric in helm/ansible operators
Browse files Browse the repository at this point in the history
  • Loading branch information
joelanford committed Nov 11, 2020
1 parent f20ea9e commit 1afcedf
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 0 deletions.
9 changes: 9 additions & 0 deletions changelog/fragments/helm-ansible-version-metric.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
entries:
- description: >
In Ansible-based operators, added the `ansible_operator_build_info`
metric to instrument commit and version information.
kind: "addition"
- description: >
In Helm-based operators, added the `helm_operator_build_info`
metric to instrument commit and version information.
kind: "addition"
15 changes: 15 additions & 0 deletions internal/ansible/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/metrics"

sdkVersion "github.com/operator-framework/operator-sdk/internal/version"
)

const (
Expand Down Expand Up @@ -50,6 +52,19 @@ var (
)

func init() {
buildInfoMetric := prometheus.NewGauge(
prometheus.GaugeOpts{
Subsystem: subsystem,
Name: "build_info",
Help: "Build information for the ansible-operator binary",
ConstLabels: map[string]string{
"commit": sdkVersion.GitCommit,
"version": sdkVersion.Version,
},
},
)
buildInfoMetric.Set(1.0)
metrics.Registry.MustRegister(buildInfoMetric)
metrics.Registry.MustRegister(reconcileResults)
metrics.Registry.MustRegister(reconciles)
}
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/helm-operator/run/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (

"github.com/operator-framework/operator-sdk/internal/helm/controller"
"github.com/operator-framework/operator-sdk/internal/helm/flags"
_ "github.com/operator-framework/operator-sdk/internal/helm/metrics"
"github.com/operator-framework/operator-sdk/internal/helm/release"
"github.com/operator-framework/operator-sdk/internal/helm/watches"
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
Expand Down
42 changes: 42 additions & 0 deletions internal/helm/metrics/metrics.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright 2020 The Operator-SDK Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package metrics

import (
"github.com/prometheus/client_golang/prometheus"
"sigs.k8s.io/controller-runtime/pkg/metrics"

sdkVersion "github.com/operator-framework/operator-sdk/internal/version"
)

const (
subsystem = "helm_operator"
)

func init() {
buildInfoMetric := prometheus.NewGauge(
prometheus.GaugeOpts{
Subsystem: subsystem,
Name: "build_info",
Help: "Build information for the helm-operator binary",
ConstLabels: map[string]string{
"commit": sdkVersion.GitCommit,
"version": sdkVersion.Version,
},
},
)
buildInfoMetric.Set(1.0)
metrics.Registry.MustRegister(buildInfoMetric)
}

0 comments on commit 1afcedf

Please sign in to comment.