Helm feature

builder/Dockerfile

@@ -5,9 +5,12 @@ WORKDIR /app
 RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor github.com/Azure/aks-periscope/cmd/aks-periscope
 
 FROM alpine
-RUN apk --no-cache add ca-certificates
+RUN apk --no-cache add ca-certificates curl openssl bash
 ADD https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/amd64/kubectl /usr/local/bin/kubectl
 RUN chmod +x /usr/local/bin/kubectl
+RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 \
+    && chmod +x get_helm.sh \
+    && ./get_helm.sh
 RUN mkdir /app
 WORKDIR /app
 COPY --from=builder /app/aks-periscope .

cmd/aks-periscope/aks-periscope.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"log"
+	"os"
 	"strings"
 	"sync"
 
@@ -22,25 +23,38 @@ func main() {
 		log.Printf("Failed to create CRD: %+v", err)
 	}
 
+	clusterType := os.Getenv("CLUSTER_TYPE")
+
 	collectors := []interfaces.Collector{}
 	containerLogsCollector := collector.NewContainerLogsCollector(exporter)
-	collectors = append(collectors, containerLogsCollector)
-	systemLogsCollector := collector.NewSystemLogsCollector(exporter)
-	collectors = append(collectors, systemLogsCollector)
 	networkOutboundCollector := collector.NewNetworkOutboundCollector(5, exporter)
-	collectors = append(collectors, networkOutboundCollector)
-	ipTablesCollector := collector.NewIPTablesCollector(exporter)
-	collectors = append(collectors, ipTablesCollector)
-	nodeLogsCollector := collector.NewNodeLogsCollector(exporter)
-	collectors = append(collectors, nodeLogsCollector)
 	dnsCollector := collector.NewDNSCollector(exporter)
-	collectors = append(collectors, dnsCollector)
 	kubeObjectsCollector := collector.NewKubeObjectsCollector(exporter)
-	collectors = append(collectors, kubeObjectsCollector)
+	systemLogsCollector := collector.NewSystemLogsCollector(exporter)
+	ipTablesCollector := collector.NewIPTablesCollector(exporter)
+	nodeLogsCollector := collector.NewNodeLogsCollector(exporter)
 	kubeletCmdCollector := collector.NewKubeletCmdCollector(exporter)
-	collectors = append(collectors, kubeletCmdCollector)
 	systemPerfCollector := collector.NewSystemPerfCollector(exporter)
-	collectors = append(collectors, systemPerfCollector)
+	helmCollector := collector.NewHelmCollector(exporter)
+
+	if strings.EqualFold(clusterType, "connectedCluster") {
+		collectors = append(collectors, containerLogsCollector)
+		collectors = append(collectors, dnsCollector)
+		collectors = append(collectors, helmCollector)
+		collectors = append(collectors, kubeObjectsCollector)
+		collectors = append(collectors, networkOutboundCollector)
+
+	} else {
+		collectors = append(collectors, containerLogsCollector)
+		collectors = append(collectors, dnsCollector)
+		collectors = append(collectors, kubeObjectsCollector)
+		collectors = append(collectors, networkOutboundCollector)
+		collectors = append(collectors, systemLogsCollector)
+		collectors = append(collectors, ipTablesCollector)
+		collectors = append(collectors, nodeLogsCollector)
+		collectors = append(collectors, kubeletCmdCollector)
+		collectors = append(collectors, systemPerfCollector)
+	}
 
 	for _, c := range collectors {
 		waitgroup.Add(1)

deployment/aks-periscope.yaml

@@ -15,7 +15,7 @@ metadata:
   name: aks-periscope-role
 rules:
 - apiGroups: ["","metrics.k8s.io"]
-  resources: ["pods", "nodes"]
+  resources: ["pods", "nodes", "secrets"]
   verbs: ["get", "watch", "list"]
 - apiGroups: ["aks-periscope.azure.github.com"]
   resources: ["diagnostics"]
@@ -80,6 +80,8 @@ spec:
             name: kubeobjects-config
         - configMapRef:
             name: nodelogs-config
+        - configMapRef:
+            name: clustertype-config
         - secretRef:
             name: azureblob-secret
         volumeMounts:
@@ -132,6 +134,14 @@ metadata:
 data:
   DIAGNOSTIC_NODELOGS_LIST: /var/log/azure/cluster-provision.log /var/log/cloud-init.log
 ---
+apiVersion: v1 
+kind: ConfigMap 
+metadata:
+  name: clustertype-config
+  namespace: aks-periscope
+data:
+  CLUSTER_TYPE: "managedCluster" # <custom flag>
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

pkg/collector/collector.go

@@ -10,6 +10,8 @@ const (
 	DNS Type = iota
 	// ContainerLogs defines ContainerLogs Collector Type
 	ContainerLogs
+	//Helm defines Helm Collector Type
+	Helm
 	// IPTables defines IPTables Collector Type
 	IPTables
 	// KubeletCmd defines KubeletCmd Collector Type
@@ -28,7 +30,7 @@ const (
 
 // Name returns type name
 func (t Type) name() string {
-	return [...]string{"dns", "containerlogs", "iptables", "kubeletcmd", "kubeobjects", "networkoutbound", "nodelogs", "systemlogs", "systemperf"}[t]
+	return [...]string{"dns", "containerlogs", "helm", "iptables", "kubeletcmd", "kubeobjects", "networkoutbound", "nodelogs", "systemlogs", "systemperf"}[t]
 }
 
 // BaseCollector defines Base Collector

pkg/collector/helm_collector.go

@@ -0,0 +1,61 @@
+package collector
+
+import (
+	"path/filepath"
+
+	"github.com/Azure/aks-periscope/pkg/interfaces"
+	"github.com/Azure/aks-periscope/pkg/utils"
+)
+
+// HelmCollector defines a Helm Collector struct
+type HelmCollector struct {
+	BaseCollector
+}
+
+var _ interfaces.Collector = &HelmCollector{}
+
+// NewHelmCollector is a constructor
+func NewHelmCollector(exporter interfaces.Exporter) *HelmCollector {
+	return &HelmCollector{
+		BaseCollector: BaseCollector{
+			collectorType: Helm,
+			exporter:      exporter,
+		},
+	}
+}
+
+// Collect implements the interface method
+func (collector *HelmCollector) Collect() error {
+	rootPath, err := utils.CreateCollectorDir(collector.GetName())
+	if err != nil {
+		return err
+	}
+
+	helmListFile := filepath.Join(rootPath, "helm_list")
+	helm_list_output, helm_list_err := utils.RunCommandOnContainer("helm", "list", "--all-namespaces")
+	if helm_list_err != nil {
+		return helm_list_err
+	}
+
+	helm_list_err = utils.WriteToFile(helmListFile, helm_list_output)
+	if helm_list_err != nil {
+		return helm_list_err
+	}
+
+	collector.AddToCollectorFiles(helmListFile)
+
+	helmHistoryFile := filepath.Join(rootPath, "helm_history")
+	helm_history_output, helm_history_err := utils.RunCommandOnContainer("helm", "history", "-n", "default", "azure-arc")
+	if helm_history_err != nil {
+		return helm_history_err
+	}
+
+	helm_history_err = utils.WriteToFile(helmHistoryFile, helm_history_output)
+	if helm_history_err != nil {
+		return helm_history_err
+	}
+
+	collector.AddToCollectorFiles(helmHistoryFile)
+
+	return nil
+}