Skip to content

Commit

Permalink
use simpler prometheus names
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrianliechti
adrianliechti committed Aug 13, 2022
1 parent be9dfb3 commit 3e2c3bd
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 46 deletions.
8 changes: 8 additions & 0 deletions app/cluster/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import (
"github.com/adrianliechti/devkube/pkg/kind"
)

const (
DefaultNamespace = "loop"
)

func SelectCluster(ctx context.Context) (string, error) {
list, err := kind.List(ctx)

Expand All @@ -25,6 +29,10 @@ func SelectCluster(ctx context.Context) (string, error) {
return "", errors.New("no instances found")
}

if len(items) == 1 {
return items[0], nil
}

i, _, err := cli.Select("Select instance", items)

if err != nil {
Expand Down
9 changes: 2 additions & 7 deletions app/cluster/cluster_create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,10 @@ metricsBindAddress: 0.0.0.0
}

if err := kind.Create(c.Context, name, config); err != nil {
return err
}

for _, image := range append(dashboard.Images, observability.Images...) {
docker.Pull(c.Context, image)
kind.LoadImage(c.Context, name, image)
//return err
}

namespace := "loop"
namespace := DefaultNamespace
kubeconfig := ""

if err := observability.InstallCRD(c.Context, kubeconfig, namespace); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion app/cluster/cluster_dashboard.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func DashboardCommand() *cli.Command {
cli.OpenURL(url)
})

namespace := "loop"
namespace := DefaultNamespace

if err := kubectl.Invoke(c.Context, kubeconfig, "port-forward", "-n", namespace, "service/dashboard", fmt.Sprintf("%d:80", port)); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion app/cluster/cluster_grafana.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func GrafanaCommand() *cli.Command {
cli.OpenURL(url)
})

namespace := "loop"
namespace := DefaultNamespace

if err := kubectl.Invoke(c.Context, kubeconfig, "port-forward", "-n", namespace, "service/grafana", fmt.Sprintf("%d:80", port)); err != nil {
return err
Expand Down
5 changes: 0 additions & 5 deletions extension/dashboard/dashboard.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ var (
dashboard = "dashboard"
dashboardChart = "kubernetes-dashboard"
dashboardVersion = "5.8.0"

Images = []string{
// "kubernetesui/dashboard:v2.5.1",
// "kubernetesui/metrics-scraper:v1.0.7",
}
)

func Install(ctx context.Context, kubeconfig, namespace string) error {
Expand Down
4 changes: 0 additions & 4 deletions extension/metrics/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ var (
metrics = "metrics-server"
metricsChart = "metrics-server"
metricsVersion = "3.8.2"

Images = []string{
// "k8s.gcr.io/metrics-server/metrics-server:v0.5.0",
}
)

func Install(ctx context.Context, kubeconfig, namespace string) error {
Expand Down
27 changes: 5 additions & 22 deletions extension/observability/observability.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,6 @@ const (
prometheusRepo = "https://prometheus-community.github.io/helm-charts"
)

var (
Images = []string{
// "grafana/loki:2.5.0",

// "grafana/tempo:1.4.0",
// "grafana/tempo-query:1.4.0",

// "grafana/promtail:2.5.0",

// "quay.io/prometheus/prometheus:v2.34.0",
// "quay.io/prometheus/node-exporter:v1.3.0",
// "k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.4.1",

// "grafana/grafana:8.5.0",
}
)

func InstallCRD(ctx context.Context, kubeconfig, namespace string) error {
crds := []string{
"crd-alertmanagerconfigs.yaml",
Expand Down Expand Up @@ -57,19 +40,19 @@ func Install(ctx context.Context, kubeconfig, namespace string) error {
namespace = "default"
}

if err := installPrometheus(ctx, kubeconfig, namespace); err != nil {
if err := installLoki(ctx, kubeconfig, namespace); err != nil {
return err
}

if err := installLoki(ctx, kubeconfig, namespace); err != nil {
if err := installPromtail(ctx, kubeconfig, namespace); err != nil {
return err
}

if err := installTempo(ctx, kubeconfig, namespace); err != nil {
return err
}

if err := installPromtail(ctx, kubeconfig, namespace); err != nil {
if err := installPrometheus(ctx, kubeconfig, namespace); err != nil {
return err
}

Expand All @@ -93,11 +76,11 @@ func Uninstall(ctx context.Context, kubeconfig, namespace string) error {
//return err
}

if err := uninstallPromtail(ctx, kubeconfig, namespace); err != nil {
if err := uninstallTempo(ctx, kubeconfig, namespace); err != nil {
//return err
}

if err := uninstallTempo(ctx, kubeconfig, namespace); err != nil {
if err := uninstallPromtail(ctx, kubeconfig, namespace); err != nil {
//return err
}

Expand Down
4 changes: 2 additions & 2 deletions extension/observability/observability_loki.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ func uninstallLoki(ctx context.Context, kubeconfig, namespace string) error {
//return err
}

if err := kubectl.Invoke(ctx, kubeconfig, "delete", "pvc", "-n", namespace, "storage-"+loki+"-0"); err != nil {
//return err
if err := kubectl.Invoke(ctx, kubeconfig, "delete", "pvc", "-n", namespace, "-l", "release="+loki); err != nil {
return err
}

return nil
Expand Down
6 changes: 4 additions & 2 deletions extension/observability/observability_prometheus.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ func installPrometheus(ctx context.Context, kubeconfig, namespace string) error
"nameOverride": prometheus,
"fullnameOverride": prometheus,

"cleanPrometheusOperatorObjectNames": true,

"kubeEtcd": map[string]any{
"service": map[string]any{
"targetPort": 2381,
Expand Down Expand Up @@ -93,11 +95,11 @@ func uninstallPrometheus(ctx context.Context, kubeconfig, namespace string) erro
//return err
}

if err := kubectl.Invoke(ctx, kubeconfig, "delete", "pvc", "-n", namespace, "-l", "app.kubernetes.io/instance="+prometheus+"-alertmanager"); err != nil {
if err := kubectl.Invoke(ctx, kubeconfig, "delete", "pvc", "-n", namespace, "-l", "app.kubernetes.io/instance="+prometheus); err != nil {
//return err
}

if err := kubectl.Invoke(ctx, kubeconfig, "delete", "pvc", "-n", namespace, "-l", "app.kubernetes.io/instance="+prometheus+"-prometheus"); err != nil {
if err := kubectl.Invoke(ctx, kubeconfig, "delete", "secret", "-n", namespace, prometheus+"-admission"); err != nil {
//return err
}

Expand Down
8 changes: 6 additions & 2 deletions extension/observability/observability_tempo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ func installTempo(ctx context.Context, kubeconfig, namespace string) error {
"enabled": true,
"size": "10Gi",
},

"tempoQuery": map[string]any{
"enabled": false,
},
}

if err := helm.Install(ctx, kubeconfig, namespace, tempo, grafanaRepo, tempoChart, tempoVersion, values); err != nil {
Expand All @@ -33,8 +37,8 @@ func uninstallTempo(ctx context.Context, kubeconfig, namespace string) error {
//return err
}

if err := kubectl.Invoke(ctx, kubeconfig, "delete", "pvc", "-n", namespace, "storage-"+tempo+"-0"); err != nil {
//return err
if err := kubectl.Invoke(ctx, kubeconfig, "delete", "pvc", "-n", namespace, "-l", "app.kubernetes.io/instance="+tempo); err != nil {
return err
}

return nil
Expand Down

0 comments on commit 3e2c3bd

Please sign in to comment.