Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/app/piped/cloudprovider/kubernetes/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,20 @@ go_library(
"kubernetes.go",
"kustomize.go",
"manifest.go",
"metrics.go",
"resourcekey.go",
"state.go",
],
importpath = "github.com/pipe-cd/pipe/pkg/app/piped/cloudprovider/kubernetes",
visibility = ["//visibility:public"],
deps = [
"//pkg/app/piped/chartrepo:go_default_library",
"//pkg/app/piped/cloudprovider/kubernetes/kubernetesmetrics:go_default_library",
"//pkg/app/piped/toolregistry:go_default_library",
"//pkg/cache:go_default_library",
"//pkg/config:go_default_library",
"//pkg/diff:go_default_library",
"//pkg/git:go_default_library",
"//pkg/model:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@io_k8s_api//apps/v1:go_default_library",
"@io_k8s_api//batch/v1:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
Expand Down
14 changes: 12 additions & 2 deletions pkg/app/piped/cloudprovider/kubernetes/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (
"strings"

"k8s.io/client-go/rest"

"github.com/pipe-cd/pipe/pkg/app/piped/cloudprovider/kubernetes/kubernetesmetrics"
)

type Kubectl struct {
Expand All @@ -39,7 +41,11 @@ func NewKubectl(version, path string) *Kubectl {

func (c *Kubectl) Apply(ctx context.Context, namespace string, manifest Manifest) (err error) {
defer func() {
metricsKubectlCalled(c.version, "apply", err == nil)
kubernetesmetrics.IncKubectlCallsCounter(
c.version,
kubernetesmetrics.LabelApplyCommand,
err == nil,
)
}()

data, err := manifest.YamlBytes()
Expand All @@ -66,7 +72,11 @@ func (c *Kubectl) Apply(ctx context.Context, namespace string, manifest Manifest

func (c *Kubectl) Delete(ctx context.Context, namespace string, r ResourceKey) (err error) {
defer func() {
metricsKubectlCalled(c.version, "delete", err == nil)
kubernetesmetrics.IncKubectlCallsCounter(
c.version,
kubernetesmetrics.LabelDeleteCommand,
err == nil,
)
}()

args := make([]string, 0, 5)
Expand Down
4 changes: 0 additions & 4 deletions pkg/app/piped/cloudprovider/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ type provider struct {
initErr error
}

func init() {
registerMetrics()
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice.

func initSharedGitClient(logger *zap.Logger) error {
var err error
initSharedGitClientOnce.Do(func() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")

go_library(
name = "go_default_library",
srcs = ["metrics.go"],
importpath = "github.com/pipe-cd/pipe/pkg/app/piped/cloudprovider/kubernetes/kubernetesmetrics",
visibility = ["//visibility:public"],
deps = ["@com_github_prometheus_client_golang//prometheus:go_default_library"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// Copyright 2021 The PipeCD 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 kubernetesmetrics

import (
"github.com/prometheus/client_golang/prometheus"
)

const (
toolKey = "tool"
versionKey = "version"
toolCommandKey = "command"
commandOutputKey = "status"
)

type Tool string

const (
LabelToolKubectl Tool = "kubectl"
)

type ToolCommand string

const (
LabelApplyCommand ToolCommand = "apply"
LabelDeleteCommand ToolCommand = "delete"
)

type CommandOutput string

const (
LabelOutputSuccess CommandOutput = "success"
LabelOutputFailre CommandOutput = "failure"
)

var (
toolCallsCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "piped_cloudprovider_kubernetes_tool_calls_total",
Help: "Number of calls made to run the tool like kubectl, kustomize.",
},
[]string{
toolKey,
versionKey,
toolCommandKey,
commandOutputKey,
},
)
)

func IncKubectlCallsCounter(version string, command ToolCommand, success bool) {
status := LabelOutputSuccess
if !success {
status = LabelOutputFailre
}
toolCallsCounter.With(prometheus.Labels{
toolKey: string(LabelToolKubectl),
versionKey: version,
toolCommandKey: string(command),
commandOutputKey: string(status),
}).Inc()
}

func Register(r prometheus.Registerer) {
r.MustRegister(toolCallsCounter)
}
62 changes: 0 additions & 62 deletions pkg/app/piped/cloudprovider/kubernetes/metrics.go

This file was deleted.

3 changes: 3 additions & 0 deletions pkg/app/piped/cmd/piped/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ go_library(
"//pkg/app/piped/apistore/environmentstore:go_default_library",
"//pkg/app/piped/apistore/eventstore:go_default_library",
"//pkg/app/piped/chartrepo:go_default_library",
"//pkg/app/piped/cloudprovider/kubernetes/kubernetesmetrics:go_default_library",
"//pkg/app/piped/controller:go_default_library",
"//pkg/app/piped/driftdetector:go_default_library",
"//pkg/app/piped/eventwatcher:go_default_library",
"//pkg/app/piped/executor/registry:go_default_library",
"//pkg/app/piped/livestatereporter:go_default_library",
"//pkg/app/piped/livestatestore:go_default_library",
"//pkg/app/piped/livestatestore/kubernetes/kubernetesmetrics:go_default_library",
"//pkg/app/piped/notifier:go_default_library",
"//pkg/app/piped/planner/registry:go_default_library",
"//pkg/app/piped/planpreview:go_default_library",
Expand All @@ -36,6 +38,7 @@ go_library(
"//pkg/rpc/rpcauth:go_default_library",
"//pkg/rpc/rpcclient:go_default_library",
"//pkg/version:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@com_github_spf13_cobra//:go_default_library",
"@org_golang_google_grpc//credentials:go_default_library",
"@org_golang_x_sync//errgroup:go_default_library",
Expand Down
12 changes: 12 additions & 0 deletions pkg/app/piped/cmd/piped/piped.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"strings"
"time"

"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/cobra"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
Expand All @@ -42,11 +43,13 @@ import (
"github.com/pipe-cd/pipe/pkg/app/piped/apistore/environmentstore"
"github.com/pipe-cd/pipe/pkg/app/piped/apistore/eventstore"
"github.com/pipe-cd/pipe/pkg/app/piped/chartrepo"
k8scloudprovidermetrics "github.com/pipe-cd/pipe/pkg/app/piped/cloudprovider/kubernetes/kubernetesmetrics"
"github.com/pipe-cd/pipe/pkg/app/piped/controller"
"github.com/pipe-cd/pipe/pkg/app/piped/driftdetector"
"github.com/pipe-cd/pipe/pkg/app/piped/eventwatcher"
"github.com/pipe-cd/pipe/pkg/app/piped/livestatereporter"
"github.com/pipe-cd/pipe/pkg/app/piped/livestatestore"
k8slivestatestoremetrics "github.com/pipe-cd/pipe/pkg/app/piped/livestatestore/kubernetes/kubernetesmetrics"
"github.com/pipe-cd/pipe/pkg/app/piped/notifier"
"github.com/pipe-cd/pipe/pkg/app/piped/planpreview"
"github.com/pipe-cd/pipe/pkg/app/piped/statsreporter"
Expand Down Expand Up @@ -116,6 +119,9 @@ func NewCommand() *cobra.Command {
}

func (p *piped) run(ctx context.Context, t cli.Telemetry) (runErr error) {
// Register all metrics.
registerMetrics()

group, ctx := errgroup.WithContext(ctx)
if p.addLoginUserToPasswd {
if err := p.insertLoginUserToPasswd(ctx); err != nil {
Expand Down Expand Up @@ -606,3 +612,9 @@ func (p *piped) insertLoginUserToPasswd(ctx context.Context) error {

return nil
}

func registerMetrics() {
r := prometheus.DefaultRegisterer
k8scloudprovidermetrics.Register(r)
k8slivestatestoremetrics.Register(r)
}
4 changes: 1 addition & 3 deletions pkg/app/piped/livestatestore/kubernetes/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ go_library(
srcs = [
"appnodes.go",
"kubernetes.go",
"metrics.go",
"reflector.go",
"store.go",
],
importpath = "github.com/pipe-cd/pipe/pkg/app/piped/livestatestore/kubernetes",
visibility = ["//visibility:public"],
deps = [
"//pkg/app/piped/cloudprovider/kubernetes:go_default_library",
"//pkg/app/piped/livestatestore/kubernetes/kubernetesmetrics:go_default_library",
"//pkg/config:go_default_library",
"//pkg/model:go_default_library",
"@com_github_google_uuid//:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1/unstructured:go_default_library",
"@io_k8s_apimachinery//pkg/runtime/schema:go_default_library",
Expand All @@ -27,7 +26,6 @@ go_library(
"@io_k8s_client_go//rest:go_default_library",
"@io_k8s_client_go//tools/cache:go_default_library",
"@io_k8s_client_go//tools/clientcmd:go_default_library",
"@io_k8s_client_go//tools/metrics:go_default_library",
"@org_uber_go_zap//:go_default_library",
],
)
Expand Down
4 changes: 0 additions & 4 deletions pkg/app/piped/livestatestore/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ func (it EventIterator) Next(maxNum int) []model.KubernetesResourceStateEvent {
return it.store.nextEvents(it.id, maxNum)
}

func init() {
registerMetrics()
}

func NewStore(cfg *config.CloudProviderKubernetesConfig, pipedConfig *config.PipedSpec, cloudProvider string, logger *zap.Logger) *Store {
logger = logger.Named("kubernetes").
With(zap.String("cloud-provider", cloudProvider))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")

go_library(
name = "go_default_library",
srcs = ["metrics.go"],
importpath = "github.com/pipe-cd/pipe/pkg/app/piped/livestatestore/kubernetes/kubernetesmetrics",
visibility = ["//visibility:public"],
deps = [
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@io_k8s_client_go//tools/metrics:go_default_library",
],
)
Loading