Show lens-metrics on cluster settings (#2714)

* show lens-metrics on cluster settings

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* remove ClusterFeature

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* remove ClusterFeature

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* tweak resource applier/stack

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* update metrics stack components

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* fix

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* fix drawer menu styles

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* cleanup

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* cleanup

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* clarify ui

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* built-in -> bundled

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* splitterError -> splitError

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* support multi-doc yamls

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* dedicated action button

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* fix headers

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* cleanup

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* async file operations

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* cleanup

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* fix bugs

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/common/catalog-entities/kubernetes-cluster.ts

@@ -28,9 +28,24 @@ import { productName } from "../vars";
 import { CatalogCategory, CatalogCategorySpec } from "../catalog";
 import { app } from "electron";
 
+
+export type KubernetesClusterPrometheusMetrics = {
+  address?: {
+    namespace: string;
+    service: string;
+    port: number;
+    prefix: string;
+  };
+  type?: string;
+};
+
 export type KubernetesClusterSpec = {
   kubeconfigPath: string;
   kubeconfigContext: string;
+  metrics?: {
+    source: string;
+    prometheus?: KubernetesClusterPrometheusMetrics;
+  }
 };
 
 export interface KubernetesClusterStatus extends CatalogEntityStatus {
@@ -88,7 +103,6 @@ export class KubernetesCluster extends CatalogEntity<CatalogEntityMetadata, Kube
   async onContextMenuOpen(context: CatalogEntityContextMenuContext) {
     context.menuItems = [
       {
-        icon: "settings",
         title: "Settings",
         onlyVisibleForSource: "local",
         onClick: async () => context.navigate(`/entity/${this.metadata.uid}/settings`)
@@ -97,7 +111,6 @@ export class KubernetesCluster extends CatalogEntity<CatalogEntityMetadata, Kube
 
     if (this.metadata.labels["file"]?.startsWith(ClusterStore.storedKubeConfigFolder)) {
       context.menuItems.push({
-        icon: "delete",
         title: "Delete",
         onlyVisibleForSource: "local",
         onClick: async () => ClusterStore.getInstance().removeById(this.metadata.uid),
@@ -108,14 +121,20 @@ export class KubernetesCluster extends CatalogEntity<CatalogEntityMetadata, Kube
     }
 
     if (this.status.phase == "connected") {
-      context.menuItems.unshift({
-        icon: "link_off",
+      context.menuItems.push({
         title: "Disconnect",
         onClick: async () => {
           ClusterStore.getInstance().deactivate(this.metadata.uid);
           requestMain(clusterDisconnectHandler, this.metadata.uid);
         }
       });
+    } else {
+      context.menuItems.push({
+        title: "Connect",
+        onClick: async () => {
+          context.navigate(`/cluster/${this.metadata.uid}`);
+        }
+      });
     }
 
     const category = catalogCategoryRegistry.getCategoryForEntity<KubernetesClusterCategory>(this);

src/common/catalog/catalog-entity.ts

@@ -83,7 +83,6 @@ export interface CatalogEntityActionContext {
 }
 
 export interface CatalogEntityContextMenu {
-  icon: string;
   title: string;
   onlyVisibleForSource?: string; // show only if empty or if matches with entity source
   onClick: () => void | Promise<void>;
@@ -92,6 +91,10 @@ export interface CatalogEntityContextMenu {
   }
 }
 
+export interface CatalogEntityAddMenu extends CatalogEntityContextMenu {
+  icon: string;
+}
+
 export interface CatalogEntitySettingsMenu {
   group?: string;
   title: string;
@@ -111,7 +114,7 @@ export interface CatalogEntitySettingsContext {
 
 export interface CatalogEntityAddMenuContext {
   navigate: (url: string) => void;
-  menuItems: CatalogEntityContextMenu[];
+  menuItems: CatalogEntityAddMenu[];
 }
 
 export type CatalogEntitySpec = Record<string, any>;

src/common/cluster-ipc.ts

@@ -31,6 +31,7 @@ export const clusterSetFrameIdHandler = "cluster:set-frame-id";
 export const clusterRefreshHandler = "cluster:refresh";
 export const clusterDisconnectHandler = "cluster:disconnect";
 export const clusterKubectlApplyAllHandler = "cluster:kubectl-apply-all";
+export const clusterKubectlDeleteAllHandler = "cluster:kubectl-delete-all";
 
 if (ipcMain) {
   handleRequest(clusterActivateHandler, (event, clusterId: ClusterId, force = false) => {
@@ -67,14 +68,39 @@ if (ipcMain) {
     }
   });
 
-  handleRequest(clusterKubectlApplyAllHandler, (event, clusterId: ClusterId, resources: string[]) => {
+  handleRequest(clusterKubectlApplyAllHandler, async (event, clusterId: ClusterId, resources: string[], extraArgs: string[]) => {
     appEventBus.emit({name: "cluster", action: "kubectl-apply-all"});
     const cluster = ClusterStore.getInstance().getById(clusterId);
 
     if (cluster) {
       const applier = new ResourceApplier(cluster);
 
-      applier.kubectlApplyAll(resources);
+      try {
+        const stdout = await applier.kubectlApplyAll(resources, extraArgs);
+
+        return { stdout };
+      } catch (error: any) {
+        return { stderr: error };
+      }
+    } else {
+      throw `${clusterId} is not a valid cluster id`;
+    }
+  });
+
+  handleRequest(clusterKubectlDeleteAllHandler, async (event, clusterId: ClusterId, resources: string[], extraArgs: string[]) => {
+    appEventBus.emit({name: "cluster", action: "kubectl-delete-all"});
+    const cluster = ClusterStore.getInstance().getById(clusterId);
+
+    if (cluster) {
+      const applier = new ResourceApplier(cluster);
+
+      try {
+        const stdout = await applier.kubectlDeleteAll(resources, extraArgs);
+
+        return { stdout };
+      } catch (error: any) {
+        return { stderr: error };
+      }
     } else {
       throw `${clusterId} is not a valid cluster id`;
     }

src/common/k8s/resource-stack.ts

@@ -0,0 +1,152 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+import fse from "fs-extra";
+import path from "path";
+import hb from "handlebars";
+import { ResourceApplier } from "../../main/resource-applier";
+import { KubernetesCluster } from "../catalog-entities";
+import logger from "../../main/logger";
+import { app } from "electron";
+import { requestMain } from "../ipc";
+import { clusterKubectlApplyAllHandler, clusterKubectlDeleteAllHandler } from "../cluster-ipc";
+import { ClusterStore } from "../cluster-store";
+import yaml from "js-yaml";
+import { productName } from "../vars";
+
+export class ResourceStack {
+  constructor(protected cluster: KubernetesCluster, protected name: string) {}
+
+  /**
+   *
+   * @param folderPath folder path that is searched for files defining kubernetes resources.
+   * @param templateContext sets the template parameters that are to be applied to any templated kubernetes resources that are to be applied.
+   */
+  async kubectlApplyFolder(folderPath: string, templateContext?: any, extraArgs?: string[]): Promise<string> {
+    const resources = await this.renderTemplates(folderPath, templateContext);
+
+    return this.applyResources(resources, extraArgs);
+  }
+
+  /**
+   *
+   * @param folderPath folder path that is searched for files defining kubernetes resources.
+   * @param templateContext sets the template parameters that are to be applied to any templated kubernetes resources that are to be applied.
+   */
+  async kubectlDeleteFolder(folderPath: string, templateContext?: any, extraArgs?: string[]): Promise<string> {
+    const resources = await this.renderTemplates(folderPath, templateContext);
+
+    return this.deleteResources(resources, extraArgs);
+  }
+
+  protected async applyResources(resources: string[], extraArgs?: string[]): Promise<string> {
+    const clusterModel = ClusterStore.getInstance().getById(this.cluster.metadata.uid);
+
+    if (!clusterModel) {
+      throw new Error(`cluster not found`);
+    }
+
+    let kubectlArgs = extraArgs || [];
+
+    kubectlArgs = this.appendKubectlArgs(kubectlArgs);
+
+    if (app) {
+      return await new ResourceApplier(clusterModel).kubectlApplyAll(resources, kubectlArgs);
+    } else {
+      const response = await requestMain(clusterKubectlApplyAllHandler, this.cluster.metadata.uid, resources, kubectlArgs);
+
+      if (response.stderr) {
+        throw new Error(response.stderr);
+      }
+
+      return response.stdout;
+    }
+  }
+
+  protected async deleteResources(resources: string[], extraArgs?: string[]): Promise<string> {
+    const clusterModel = ClusterStore.getInstance().getById(this.cluster.metadata.uid);
+
+    if (!clusterModel) {
+      throw new Error(`cluster not found`);
+    }
+
+    let kubectlArgs = extraArgs || [];
+
+    kubectlArgs = this.appendKubectlArgs(kubectlArgs);
+
+    if (app) {
+      return await new ResourceApplier(clusterModel).kubectlDeleteAll(resources, kubectlArgs);
+    } else {
+      const response = await requestMain(clusterKubectlDeleteAllHandler, this.cluster.metadata.uid, resources, kubectlArgs);
+
+      if (response.stderr) {
+        throw new Error(response.stderr);
+      }
+
+      return response.stdout;
+    }
+  }
+
+  protected appendKubectlArgs(kubectlArgs: string[]) {
+    if (!kubectlArgs.includes("-l") && !kubectlArgs.includes("--label")) {
+      return kubectlArgs.concat(["-l", `app.kubernetes.io/name=${this.name}`]);
+    }
+
+    return kubectlArgs;
+  }
+
+  protected async renderTemplates(folderPath: string, templateContext: any): Promise<string[]> {
+    const resources: string[] = [];
+
+    logger.info(`[RESOURCE-STACK]: render templates from ${folderPath}`);
+    const files = await fse.readdir(folderPath);
+
+    for(const filename of files) {
+      const file = path.join(folderPath, filename);
+      const raw = await fse.readFile(file);
+      let resourceData: string;
+
+      if (filename.endsWith(".hb")) {
+        const template = hb.compile(raw.toString());
+
+        resourceData = template(templateContext);
+      } else {
+        resourceData = raw.toString();
+      }
+
+      if (!resourceData.trim()) continue;
+
+      const resourceArray = yaml.safeLoadAll(resourceData.toString());
+
+      resourceArray.forEach((resource) => {
+        if (resource?.metadata) {
+          resource.metadata.labels ||= {};
+          resource.metadata.labels["app.kubernetes.io/name"] = this.name;
+          resource.metadata.labels["app.kubernetes.io/managed-by"] = productName;
+          resource.metadata.labels["app.kubernetes.io/created-by"] = "resource-stack";
+        }
+
+        resources.push(yaml.safeDump(resource));
+      });
+    }
+
+    return resources;
+  }
+}

src/extensions/cluster-feature.ts

@@ -1,156 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-import fs from "fs";
-import path from "path";
-import hb from "handlebars";
-import { observable } from "mobx";
-import { ResourceApplier } from "../main/resource-applier";
-import { KubernetesCluster } from "./core-api/catalog";
-import logger from "../main/logger";
-import { app } from "electron";
-import { requestMain } from "../common/ipc";
-import { clusterKubectlApplyAllHandler } from "../common/cluster-ipc";
-import { ClusterStore } from "../common/cluster-store";
-
-export interface ClusterFeatureStatus {
-  /** feature's current version, as set by the implementation */
-  currentVersion: string;
-  /** feature's latest version, as set by the implementation */
-  latestVersion: string;
-  /** whether the feature is installed or not, as set by the implementation */
-  installed: boolean;
-  /** whether the feature can be upgraded or not, as set by the implementation */
-  canUpgrade: boolean;
-}
-
-export abstract class ClusterFeature {
-
-  /**
-   * this field sets the template parameters that are to be applied to any templated kubernetes resources that are to be installed for the feature.
-   * See the renderTemplates() method for more details
-   */
-  templateContext: any;
-
-  /**
-   * this field holds the current feature status, is accessed directly by Lens
-   */
-  @observable status: ClusterFeatureStatus = {
-    currentVersion: null,
-    installed: false,
-    latestVersion: null,
-    canUpgrade: false
-  };
-
-  /**
-   * to be implemented in the derived class, this method is typically called by Lens when a user has indicated that this feature is to be installed. The implementation
-   * of this method should install kubernetes resources using the applyResources() method, or by directly accessing the kubernetes api (K8sApi)
-   *
-   * @param cluster the cluster that the feature is to be installed on
-   */
-  abstract install(cluster: KubernetesCluster): Promise<void>;
-
-  /**
-   * to be implemented in the derived class, this method is typically called by Lens when a user has indicated that this feature is to be upgraded. The implementation
-   * of this method should upgrade the kubernetes resources already installed, if relevant to the feature
-   *
-   * @param cluster the cluster that the feature is to be upgraded on
-   */
-  abstract upgrade(cluster: KubernetesCluster): Promise<void>;
-
-  /**
-   * to be implemented in the derived class, this method is typically called by Lens when a user has indicated that this feature is to be uninstalled. The implementation
-   * of this method should uninstall kubernetes resources using the kubernetes api (K8sApi)
-   *
-   * @param cluster the cluster that the feature is to be uninstalled from
-   */
-  abstract uninstall(cluster: KubernetesCluster): Promise<void>;
-
-  /**
-   * to be implemented in the derived class, this method is called periodically by Lens to determine details about the feature's current status. The implementation
-   * of this method should provide the current status information. The currentVersion and latestVersion fields may be displayed by Lens in describing the feature.
-   * The installed field should be set to true if the feature has been installed, otherwise false. Also, Lens relies on the canUpgrade field to determine if the feature
-   * can be upgraded so the implementation should set the canUpgrade field according to specific rules for the feature, if relevant.
-   *
-   * @param cluster the cluster that the feature may be installed on
-   *
-   * @return a promise, resolved with the updated ClusterFeatureStatus
-   */
-  abstract updateStatus(cluster: KubernetesCluster): Promise<ClusterFeatureStatus>;
-
-  /**
-   * this is a helper method that conveniently applies kubernetes resources to the cluster.
-   *
-   * @param cluster the cluster that the resources are to be applied to
-   * @param resourceSpec as a string type this is a folder path that is searched for files specifying kubernetes resources. The files are read and if any of the resource
-   * files are templated, the template parameters are filled using the templateContext field (See renderTemplate() method). Finally the resources are applied to the
-   * cluster. As a string[] type resourceSpec is treated as an array of fully formed (not templated) kubernetes resources that are applied to the cluster
-   */
-  protected async applyResources(cluster: KubernetesCluster, resourceSpec: string | string[]) {
-    let resources: string[];
-
-    const clusterModel = ClusterStore.getInstance().getById(cluster.metadata.uid);
-
-    if (!clusterModel) {
-      throw new Error(`cluster not found`);
-    }
-
-    if ( typeof resourceSpec === "string" ) {
-      resources = this.renderTemplates(resourceSpec);
-    } else {
-      resources = resourceSpec;
-    }
-
-    if (app) {
-      await new ResourceApplier(clusterModel).kubectlApplyAll(resources);
-    } else {
-      await requestMain(clusterKubectlApplyAllHandler, cluster.metadata.uid, resources);
-    }
-  }
-
-  /**
-   * this is a helper method that conveniently reads kubernetes resource files into a string array. It also fills templated resource files with the template parameter values
-   * specified by the templateContext field. Templated files must end with the extension '.hb' and the template syntax must be compatible with handlebars.js
-   *
-   * @param folderPath this is a folder path that is searched for files defining kubernetes resources.
-   *
-   * @return an array of strings, each string being the contents of a resource file found in the folder path. This can be passed directly to applyResources()
-   */
-  protected renderTemplates(folderPath: string): string[] {
-    const resources: string[] = [];
-
-    logger.info(`[FEATURE]: render templates from ${folderPath}`);
-    fs.readdirSync(folderPath).forEach(filename => {
-      const file = path.join(folderPath, filename);
-      const raw = fs.readFileSync(file);
-
-      if (filename.endsWith(".hb")) {
-        const template = hb.compile(raw.toString());
-
-        resources.push(template(this.templateContext));
-      } else {
-        resources.push(raw.toString());
-      }
-    });
-
-    return resources;
-  }
-}

src/extensions/core-api/cluster-feature.ts

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-export { ClusterFeature as Feature } from "../cluster-feature";
-export type { ClusterFeatureStatus as FeatureStatus } from "../cluster-feature";

src/extensions/core-api/index.ts

@@ -28,7 +28,6 @@ import * as App from "./app";
 import * as EventBus from "./event-bus";
 import * as Store from "./stores";
 import * as Util from "./utils";
-import * as ClusterFeature from "./cluster-feature";
 import * as Interface from "../interfaces";
 import * as Catalog from "./catalog";
 import * as Types from "./types";
@@ -37,7 +36,6 @@ export {
   App,
   EventBus,
   Catalog,
-  ClusterFeature,
   Interface,
   Store,
   Types,

src/extensions/registries/entity-setting-registry.ts

@@ -32,13 +32,14 @@ export interface EntitySettingComponents {
 }
 
 export interface EntitySettingRegistration {
-  title: string;
-  kind: string;
   apiVersions: string[];
-  source?: string;
+  kind: string;
+  title: string;
   components: EntitySettingComponents;
+  source?: string;
   id?: string;
   priority?: number;
+  group?: string;
 }
 
 export interface RegisteredEntitySetting extends EntitySettingRegistration {

src/extensions/renderer-api/components.ts

@@ -30,6 +30,7 @@ export * from "../../renderer/components/checkbox";
 export * from "../../renderer/components/radio";
 export * from "../../renderer/components/select";
 export * from "../../renderer/components/slider";
+export * from "../../renderer/components/switch";
 export * from "../../renderer/components/input/input";
 
 // command-overlay

src/extensions/renderer-api/k8s-api.ts

@@ -20,6 +20,7 @@
  */
 
 export { isAllowedResource } from "../../common/rbac";
+export { ResourceStack } from "../../common/k8s/resource-stack";
 export { apiManager } from "../../renderer/api/api-manager";
 export { KubeObjectStore } from "../../renderer/kube-object.store";
 export { KubeApi, forCluster, IKubeApiCluster } from "../../renderer/api/kube-api";

src/main/cluster-manager.ts

@@ -29,7 +29,7 @@ import logger from "./logger";
 import { apiKubePrefix } from "../common/vars";
 import { Singleton } from "../common/utils";
 import { catalogEntityRegistry } from "../common/catalog";
-import { KubernetesCluster } from "../common/catalog-entities/kubernetes-cluster";
+import { KubernetesCluster, KubernetesClusterPrometheusMetrics } from "../common/catalog-entities/kubernetes-cluster";
 
 export class ClusterManager extends Singleton {
   constructor() {
@@ -68,7 +68,7 @@ export class ClusterManager extends Singleton {
       const index = catalogEntityRegistry.items.findIndex((entity) => entity.metadata.uid === cluster.id);
 
       if (index !== -1) {
-        const entity = catalogEntityRegistry.items[index];
+        const entity = catalogEntityRegistry.items[index] as KubernetesCluster;
 
         entity.status.phase = cluster.disconnected ? "disconnected" : "connected";
         entity.status.active = !cluster.disconnected;
@@ -76,6 +76,17 @@ export class ClusterManager extends Singleton {
         if (cluster.preferences?.clusterName) {
           entity.metadata.name = cluster.preferences.clusterName;
         }
+
+        entity.spec.metrics ||= { source: "local" };
+
+        if (entity.spec.metrics.source === "local") {
+          const prometheus: KubernetesClusterPrometheusMetrics = entity.spec?.metrics?.prometheus || {};
+
+          prometheus.type = cluster.preferences.prometheusProvider?.type;
+          prometheus.address = cluster.preferences.prometheus;
+          entity.spec.metrics.prometheus = prometheus;
+        }
+
         catalogEntityRegistry.items.splice(index, 1, entity);
       }
     }

src/main/resource-applier.ts

@@ -73,7 +73,15 @@ export class ResourceApplier {
     });
   }
 
-  public async kubectlApplyAll(resources: string[]): Promise<string> {
+  public async kubectlApplyAll(resources: string[], extraArgs = ["-o", "json"]): Promise<string> {
+    return this.kubectlCmdAll("apply", resources, extraArgs);
+  }
+
+  public async kubectlDeleteAll(resources: string[], extraArgs?: string[]): Promise<string> {
+    return this.kubectlCmdAll("delete", resources, extraArgs);
+  }
+
+  protected async kubectlCmdAll(subCmd: string, resources: string[], args: string[] = []): Promise<string> {
     const { kubeCtl } = this.cluster;
     const kubectlPath = await kubeCtl.getPath();
     const proxyKubeconfigPath =  await this.cluster.getProxyKubeconfigPath();
@@ -85,19 +93,24 @@ export class ResourceApplier {
       resources.forEach((resource, index) => {
         fs.writeFileSync(path.join(tmpDir, `${index}.yaml`), resource);
       });
-      const cmd = `"${kubectlPath}" apply --kubeconfig "${proxyKubeconfigPath}" -o json -f "${tmpDir}"`;
+      args.push("-f", `"${tmpDir}"`);
+      const cmd = `"${kubectlPath}" ${subCmd} --kubeconfig "${proxyKubeconfigPath}" ${args.join(" ")}`;
 
-      console.log("shooting manifests with:", cmd);
-      exec(cmd, (error, stdout, stderr) => {
+      logger.info(`[RESOURCE-APPLIER] running cmd ${cmd}`);
+      exec(cmd, (error, stdout) => {
         if (error) {
-          reject(`Error applying manifests:${error}`);
-        }
+          logger.error(`[RESOURCE-APPLIER] cmd errored: ${error}`);
+          const splitError = error.toString().split(`.yaml": `);
 
-        if (stderr != "") {
-          reject(stderr);
+          if (splitError[1]) {
+            reject(splitError[1]);
+          } else {
+            reject(error);
+          }
 
           return;
         }
+
         resolve(stdout);
       });
     });

src/renderer/api/catalog-entity.ts

@@ -30,6 +30,7 @@ export {
   CatalogEntityKindData,
   CatalogEntityActionContext,
   CatalogEntityAddMenuContext,
+  CatalogEntityAddMenu,
   CatalogEntityContextMenu,
   CatalogEntityContextMenuContext
 } from "../../common/catalog";

src/renderer/components/+catalog/catalog-add-button.tsx

@@ -26,7 +26,7 @@ import { Icon } from "../icon";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { observable, reaction } from "mobx";
 import { autobind } from "../../../common/utils";
-import { CatalogCategory, CatalogEntityAddMenuContext, CatalogEntityContextMenu } from "../../api/catalog-entity";
+import { CatalogCategory, CatalogEntityAddMenuContext, CatalogEntityAddMenu } from "../../api/catalog-entity";
 import { EventEmitter } from "events";
 import { navigate } from "../../navigation";
 
@@ -37,7 +37,7 @@ export type CatalogAddButtonProps = {
 @observer
 export class CatalogAddButton extends React.Component<CatalogAddButtonProps> {
   @observable protected isOpen = false;
-  protected menuItems = observable.array<CatalogEntityContextMenu>([]);
+  protected menuItems = observable.array<CatalogEntityAddMenu>([]);
 
   componentDidMount() {
     disposeOnUnmount(this, [

src/renderer/components/+catalog/catalog.tsx

@@ -29,7 +29,6 @@ import { navigate } from "../../navigation";
 import { kebabCase } from "lodash";
 import { PageLayout } from "../layout/page-layout";
 import { MenuItem, MenuActions } from "../menu";
-import { Icon } from "../icon";
 import { CatalogEntityContextMenu, CatalogEntityContextMenuContext, catalogEntityRunContext } from "../../api/catalog-entity";
 import { Badge } from "../badge";
 import { HotbarStore } from "../../../common/hotbar-store";
@@ -136,16 +135,16 @@ export class Catalog extends React.Component {
 
     return (
       <MenuActions onOpen={() => item.onContextMenuOpen(this.contextMenu)}>
-        <MenuItem key="add-to-hotbar" onClick={() => this.addToHotbar(item) }>
-          <Icon material="push_pin" small interactive={true} title="Pin to Hotbar"/> Pin to Hotbar
-        </MenuItem>
         {
           menuItems.map((menuItem, index) => (
             <MenuItem key={index} onClick={() => this.onMenuItemClick(menuItem)}>
-              <Icon material={menuItem.icon} small interactive={true} title={menuItem.title} /> {menuItem.title}
+              {menuItem.title}
             </MenuItem>
           ))
         }
+        <MenuItem key="add-to-hotbar" onClick={() => this.addToHotbar(item) }>
+          Pin to Hotbar
+        </MenuItem>
       </MenuActions>
     );
   }

src/renderer/components/+entity-settings/entity-settings.tsx

@@ -32,6 +32,7 @@ import { CatalogEntity } from "../../api/catalog-entity";
 import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
 import { entitySettingRegistry } from "../../../extensions/registries";
 import { EntitySettingsRouteParams } from "./entity-settings.route";
+import { groupBy } from "lodash";
 
 interface Props extends RouteComponentProps<EntitySettingsRouteParams> {
 }
@@ -57,9 +58,15 @@ export class EntitySettings extends React.Component<Props> {
   async componentDidMount() {
     const { hash } = navigation.location;
 
-    this.ensureActiveTab();
+    if (hash) {
+      const item = this.menuItems.find((item) => item.title === hash.slice(1));
 
-    document.getElementById(hash.slice(1))?.scrollIntoView();
+      if (item) {
+        this.activeTab = item.id;
+      }
+    }
+
+    this.ensureActiveTab();
   }
 
   onTabChange = (tabId: string) => {
@@ -67,18 +74,24 @@ export class EntitySettings extends React.Component<Props> {
   };
 
   renderNavigation() {
+    const groups = Object.entries(groupBy(this.menuItems, (item) => item.group || "Extensions"));
+
     return (
       <>
         <h2>{this.entity.metadata.name}</h2>
         <Tabs className="flex column" scrollable={false} onChange={this.onTabChange} value={this.activeTab}>
-          <div className="header">Settings</div>
-          { this.menuItems.map((setting) => (
-            <Tab
-              key={setting.id}
-              value={setting.id}
-              label={setting.title}
-              data-testid={`${setting.id}-tab`}
-            />
+          { groups.map((group) => (
+            <>
+              <div className="header">{group[0]}</div>
+              { group[1].map((setting, index) => (
+                <Tab
+                  key={index}
+                  value={setting.id}
+                  label={setting.title}
+                  data-testid={`${setting.id}-tab`}
+                />
+              ))}
+            </>
           ))}
         </Tabs>
       </>
@@ -111,7 +124,7 @@ export class EntitySettings extends React.Component<Props> {
         <section>
           <h2 data-testid={`${activeSetting.id}-header`}>{activeSetting.title}</h2>
           <section>
-            <activeSetting.components.View entity={this.entity} />
+            <activeSetting.components.View entity={this.entity} key={activeSetting.title} />
           </section>
         </section>
       </PageLayout>

src/renderer/components/cluster-settings/cluster-settings.tsx

@@ -43,6 +43,7 @@ entitySettingRegistry.add([
     kind: "KubernetesCluster",
     source: "local",
     title: "General",
+    group: "Settings",
     components: {
       View: (props: { entity: CatalogEntity }) => {
         const cluster = getClusterForEntity(props.entity);
@@ -68,6 +69,7 @@ entitySettingRegistry.add([
     apiVersions: ["entity.k8slens.dev/v1alpha1"],
     kind: "KubernetesCluster",
     title: "Proxy",
+    group: "Settings",
     components: {
       View: (props: { entity: CatalogEntity }) => {
         const cluster = getClusterForEntity(props.entity);
@@ -88,6 +90,7 @@ entitySettingRegistry.add([
     apiVersions: ["entity.k8slens.dev/v1alpha1"],
     kind: "KubernetesCluster",
     title: "Terminal",
+    group: "Settings",
     components: {
       View: (props: { entity: CatalogEntity }) => {
         const cluster = getClusterForEntity(props.entity);
@@ -108,6 +111,7 @@ entitySettingRegistry.add([
     apiVersions: ["entity.k8slens.dev/v1alpha1"],
     kind: "KubernetesCluster",
     title: "Namespaces",
+    group: "Settings",
     components: {
       View: (props: { entity: CatalogEntity }) => {
         const cluster = getClusterForEntity(props.entity);
@@ -128,6 +132,7 @@ entitySettingRegistry.add([
     apiVersions: ["entity.k8slens.dev/v1alpha1"],
     kind: "KubernetesCluster",
     title: "Metrics",
+    group: "Settings",
     components: {
       View: (props: { entity: CatalogEntity }) => {
         const cluster = getClusterForEntity(props.entity);

src/renderer/components/cluster-settings/components/cluster-metrics-setting.scss

@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-.MetricsSelect {
-  $spacing: $padding;
-  --flex-gap: #{$spacing};
-
-  .Badge {
-    margin-top: $spacing;
-  }
-
-  .Button {
-    margin-top: $spacing;
-  }
-}

src/renderer/components/cluster-settings/components/cluster-metrics-setting.tsx

@@ -19,8 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import "./cluster-metrics-setting.scss";
-
 import React from "react";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { Select, SelectOption } from "../../select/select";

src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx

@@ -27,6 +27,7 @@ import { SubTitle } from "../../layout/sub-title";
 import { Select, SelectOption } from "../../select";
 import { Input } from "../../input";
 import { observable, computed, autorun } from "mobx";
+import { productName } from "../../../../common/vars";
 
 const options: SelectOption<string>[] = [
   { value: "", label: "Auto detect" },
@@ -102,23 +103,20 @@ export class ClusterPrometheusSetting extends React.Component<Props> {
   render() {
     return (
       <>
-        <SubTitle title="Prometheus installation method"/>
-        <p>
-          Use pre-installed Prometheus service for metrics. Please refer to the{" "}
-          <a href="https://github.com/lensapp/lens/blob/master/troubleshooting/custom-prometheus.md" target="_blank" rel="noreferrer">guide</a>{" "}
-          for possible configuration changes.
-        </p>
-        <Select
-          value={this.provider}
-          onChange={({value}) => {
-            this.provider = value;
-            this.onSaveProvider();
-          }}
-          options={options}
-        />
-        <small className="hint">What query format is used to fetch metrics from Prometheus</small>
+        <section>
+          <SubTitle title="Prometheus"/>
+          <Select
+            value={this.provider}
+            onChange={({value}) => {
+              this.provider = value;
+              this.onSaveProvider();
+            }}
+            options={options}
+          />
+          <small className="hint">What query format is used to fetch metrics from Prometheus</small>
+        </section>
         {this.canEditPrometheusPath && (
-          <>
+          <section>
             <p>Prometheus service address.</p>
             <Input
               theme="round-black"
@@ -129,9 +127,9 @@ export class ClusterPrometheusSetting extends React.Component<Props> {
             />
             <small className="hint">
               An address to an existing Prometheus installation{" "}
-              ({"<namespace>/<service>:<port>"}). Lens tries to auto-detect address if left empty.
+              ({"<namespace>/<service>:<port>"}). {productName} tries to auto-detect address if left empty.
             </small>
-          </>
+          </section>
         )}
       </>
     );

src/renderer/components/cluster-settings/components/remove-cluster-button.tsx

@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-import React from "react";
-import { observer } from "mobx-react";
-import { ClusterStore } from "../../../../common/cluster-store";
-import { Cluster } from "../../../../main/cluster";
-import { autobind } from "../../../utils";
-import { Button } from "../../button";
-import { ConfirmDialog } from "../../confirm-dialog";
-
-interface Props {
-  cluster: Cluster;
-}
-
-@observer
-export class RemoveClusterButton extends React.Component<Props> {
-  @autobind()
-  confirmRemoveCluster() {
-    const { cluster } = this.props;
-
-    ConfirmDialog.open({
-      message: <p>Are you sure you want to remove <b>{cluster.preferences.clusterName}</b> from Lens?</p>,
-      labelOk: "Yes",
-      labelCancel: "No",
-      ok: async () => {
-        await ClusterStore.getInstance().removeById(cluster.id);
-      }
-    });
-  }
-
-  render() {
-    return (
-      <Button accent onClick={this.confirmRemoveCluster} className="button-area">
-        Remove Cluster
-      </Button>
-    );
-  }
-}

src/renderer/components/cluster-settings/components/show-metrics.tsx

@@ -19,8 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import "./cluster-metrics-setting.scss";
-
 import React from "react";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { Cluster } from "../../../../main/cluster";

src/renderer/components/drawer/drawer.scss

@@ -83,6 +83,10 @@
     .MenuActions.toolbar .Icon {
       color: $drawerTitleText;
     }
+
+    .Menu {
+      box-shadow: none;
+    }
   }
 
   .drawer-content {
@@ -99,4 +103,4 @@
       width: var(--full-size)
     }
   }
-}
+}

src/renderer/components/hotbar/hotbar-entity-icon.tsx

@@ -105,13 +105,11 @@ export class HotbarEntityIcon extends React.Component<Props> {
     if (!isPersisted) {
       menuItems.unshift({
         title: "Pin to Hotbar",
-        icon: "push_pin",
         onClick: () => add(entity, index)
       });
     } else {
       menuItems.unshift({
         title: "Unpin from Hotbar",
-        icon: "push_pin",
         onClick: () => remove(entity.metadata.uid)
       });
     }

src/renderer/components/hotbar/hotbar-icon.tsx

@@ -29,7 +29,6 @@ import GraphemeSplitter from "grapheme-splitter";
 import { CatalogEntityContextMenu } from "../../../common/catalog";
 import { cssNames, IClassName, iter } from "../../utils";
 import { ConfirmDialog } from "../confirm-dialog";
-import { Icon } from "../icon";
 import { Menu, MenuItem } from "../menu";
 import { MaterialTooltip } from "../+catalog/material-tooltip/material-tooltip";
 import { observer } from "mobx-react";
@@ -137,7 +136,7 @@ export const HotbarIcon = observer(({menuItems = [], ...props}: Props) => {
         { menuItems.map((menuItem) => {
           return (
             <MenuItem key={menuItem.title} onClick={() => onMenuItemClick(menuItem) }>
-              <Icon material={menuItem.icon} small interactive={true} title={menuItem.title}/> {menuItem.title}
+              {menuItem.title}
             </MenuItem>
           );
         })}

src/renderer/components/menu/menu.scss

@@ -20,7 +20,7 @@
  */
 
 .Menu {
-  --bgc: #{$contentColor};
+  --bgc: #{$layoutBackground};
 
   position: absolute;
   display: flex;
@@ -29,6 +29,8 @@
   list-style: none;
   border: 1px solid $borderColor;
   z-index: 101;
+  box-shadow: rgba(0,0,0,0.24) 0px 8px 16px 0px;
+  border-radius: 4px;
 
   &.portal {
     left: -1000px;