Merge branch 'master' into extensions_register_feature_clean_up

# Conflicts:
#	extensions/support-page/main.ts

extensions/example-extension/package-lock.json

@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@k8slens/extensions": {
+      "version": "file:../../src/extensions/npm/extensions",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",

extensions/example-extension/package.json

@@ -16,6 +16,7 @@
     "react-open-doodles": "^1.0.5"
   },
   "devDependencies": {
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
     "ts-loader": "^8.0.4",
     "typescript": "^4.0.3",
     "webpack": "^4.44.2"

extensions/example-extension/tsconfig.json

@@ -16,7 +16,6 @@
     "jsx": "react"
   },
   "include": [
-    "../../src/extensions/npm/**/*.d.ts",
     "./*.ts",
     "./*.tsx"
   ],

extensions/metrics-cluster-feature/package-lock.json

@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@k8slens/extensions": {
+      "version": "file:../../src/extensions/npm/extensions",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",

extensions/metrics-cluster-feature/package.json

@@ -15,6 +15,7 @@
     "semver": "^7.3.2"
   },
   "devDependencies": {
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
     "ts-loader": "^8.0.4",
     "typescript": "^4.0.3",
     "webpack": "^4.44.2",

extensions/metrics-cluster-feature/tsconfig.json

@@ -16,7 +16,6 @@
     "jsx": "react"
   },
   "include": [
-    "../../src/extensions/npm/**/*.d.ts",
     "./*.ts",
     "./*.tsx"
   ],

extensions/node-menu/package-lock.json

@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@k8slens/extensions": {
+      "version": "file:../../src/extensions/npm/extensions",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",

extensions/node-menu/package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
     "ts-loader": "^8.0.4",
     "typescript": "^4.0.3",
     "webpack": "^4.44.2",

extensions/node-menu/tsconfig.json

@@ -16,7 +16,6 @@
     "jsx": "react"
   },
   "include": [
-    "../../src/extensions/npm/**/*.d.ts",
     "./*.ts",
     "./*.tsx"
   ],

extensions/pod-menu/package-lock.json

@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@k8slens/extensions": {
+      "version": "file:../../src/extensions/npm/extensions",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",

extensions/pod-menu/package.json

@@ -17,6 +17,7 @@
     "typescript": "^4.0.3",
     "webpack": "^4.44.2",
     "mobx": "^5.15.5",
-    "react": "^16.13.1"
+    "react": "^16.13.1",
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions"
   }
 }

extensions/pod-menu/src/logs-menu.tsx

@@ -15,7 +15,6 @@ export class PodLogsMenu extends React.Component<PodLogsMenuProps> {
       selectedContainer: container,
       showTimestamps: false,
       previous: false,
-      tailLines: 1000
     });
   }
 

extensions/pod-menu/src/shell-menu.tsx

@@ -33,7 +33,6 @@ export class PodShellMenu extends React.Component<PodShellMenuProps> {
 
   render() {
     const { object, toolbar } = this.props
-    console.log(Object.keys(object))
     const containers = object.getRunningContainers();
     if (!containers.length) return;
     return (

extensions/pod-menu/tsconfig.json

@@ -16,7 +16,6 @@
     "jsx": "react"
   },
   "include": [
-    "../../src/extensions/npm/**/*.d.ts",
     "./*.ts",
     "./*.tsx"
   ],

extensions/support-page/main.ts

@@ -7,10 +7,7 @@ export default class SupportPageMainExtension extends LensMainExtension {
       parentId: "help",
       label: "Support",
       click() {
-        windowManager.navigate({
-          channel: "menu:navigate", // fixme: use windowManager.ensureMainWindow from Tray's PR
-          url: supportPageURL(),
-        });
+        windowManager.navigate(supportPageURL());
       }
     }
   ]

extensions/support-page/package-lock.json

@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@k8slens/extensions": {
+      "version": "file:../../src/extensions/npm/extensions",
+      "dev": true
+    },
     "@types/anymatch": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",

extensions/support-page/package.json

@@ -14,6 +14,7 @@
     "@types/react": "^16.9.53",
     "@types/react-router": "^5.1.8",
     "@types/webpack": "^4.41.17",
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
     "mobx": "^5.15.5",
     "react": "^16.13.1",
     "ts-loader": "^8.0.4",

extensions/support-page/src/support.tsx

@@ -3,13 +3,13 @@
 
 import React from "react"
 import { observer } from "mobx-react"
-import { CommonVars, Component } from "@k8slens/extensions";
+import { App, Component } from "@k8slens/extensions";
 
 @observer
 export class Support extends React.Component {
   render() {
     const { PageLayout } = Component;
-    const { slackUrl, issuesTrackerUrl } = CommonVars;
+    const { slackUrl, issuesTrackerUrl } = App;
     return (
       <PageLayout showOnTop className="Support" header={<h2>Support</h2>}>
         <h2>Community Slack Channel</h2>

extensions/support-page/tsconfig.json

@@ -24,7 +24,6 @@
   },
   "include": [
     "renderer.tsx",
-    "../../src/extensions/npm/**/*.d.ts",
     "src/**/*"
   ]
 }

extensions/telemetry/package-lock.json

@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@k8slens/extensions": {
+      "version": "file:../../src/extensions/npm/extensions",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",

extensions/telemetry/package.json

@@ -14,6 +14,7 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "@k8slens/extensions": "file:../../src/extensions/npm/extensions",
     "ts-loader": "^8.0.4",
     "typescript": "^4.0.3",
     "webpack": "^4.44.2",

extensions/telemetry/src/tracker.ts

@@ -1,4 +1,4 @@
-import { EventBus, Util } from "@k8slens/extensions"
+import { EventBus, Util, Store, App } from "@k8slens/extensions"
 import ua from "universal-analytics"
 import { machineIdSync } from "node-machine-id"
 import { telemetryPreferencesStore } from "./telemetry-preferences-store"
@@ -15,6 +15,8 @@ export class Tracker extends Util.Singleton {
   protected locale: string;
   protected electronUA: string;
 
+  protected reportInterval: NodeJS.Timeout
+
   private constructor() {
     super();
     try {
@@ -23,7 +25,7 @@ export class Tracker extends Util.Singleton {
       this.visitor = ua(Tracker.GA_ID)
     }
     this.visitor.set("dl", "https://telemetry.k8slens.dev")
-
+    this.visitor.set("ua", `Lens ${App.version} (${this.getOS()})`)
   }
 
   start() {
@@ -36,6 +38,8 @@ export class Tracker extends Util.Singleton {
     }
     this.eventHandlers.push(handler)
     EventBus.appEventBus.addListener(handler)
+
+    this.reportInterval = setInterval(this.reportData, 60 * 60 * 1000) // report every 1h
   }
 
   stop() {
@@ -46,12 +50,59 @@ export class Tracker extends Util.Singleton {
     for (const handler of this.eventHandlers) {
       EventBus.appEventBus.removeListener(handler)
     }
+    if (this.reportInterval) {
+      clearInterval(this.reportInterval)
+    }
   }
 
   protected async isTelemetryAllowed(): Promise<boolean> {
     return telemetryPreferencesStore.enabled
   }
 
+  protected reportData() {
+    const clustersList = Store.clusterStore.clustersList
+
+    this.event("generic-data", "report", {
+      appVersion: App.version,
+      clustersCount: clustersList.length,
+      workspacesCount: Store.workspaceStore.workspacesList.length
+    })
+
+    clustersList.forEach((cluster) => {
+      if (!cluster?.metadata.lastSeen) { return }
+      this.reportClusterData(cluster)
+    })
+  }
+
+  protected reportClusterData(cluster: Store.ClusterModel) {
+    this.event("cluster-data", "report", {
+      id: cluster.metadata.id,
+      kubernetesVersion: cluster.metadata.version,
+      distribution: cluster.metadata.distribution,
+      nodesCount: cluster.metadata.nodes,
+      lastSeen: cluster.metadata.lastSeen
+    })
+  }
+
+  protected getOS() {
+    let os = ""
+    if (App.isMac) {
+      os = "MacOS"
+    } else if(App.isWindows) {
+      os = "Windows"
+    } else if (App.isLinux) {
+      os = "Linux"
+      if (App.isSnap) {
+        os += "; Snap"
+      } else {
+        os += "; AppImage"
+      }
+    } else {
+      os = "Unknown"
+    }
+    return os
+  }
+
   protected async event(eventCategory: string, eventAction: string, otherParams = {}) {
     try {
       const allowed = await this.isTelemetryAllowed();

extensions/telemetry/tsconfig.json

@@ -24,7 +24,6 @@
   },
   "include": [
     "renderer.ts",
-    "../../src/extensions/npm/**/*.d.ts",
     "src/**/*"
   ]
 }