remove snap stuff

superclassiceth · Jan 18, 2018 · ca9d31d · ca9d31d
1 parent 8c899dd
commit ca9d31d
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 90 deletions.
diff --git a/dist/components/clusters/clusterConfig.js b/dist/components/clusters/clusterConfig.js
diff --git a/dist/components/clusters/clusterConfig.js.map b/dist/components/clusters/clusterConfig.js.map
diff --git a/dist/dashboards/kubernetes-container.json b/dist/dashboards/kubernetes-container.json
@@ -130,9 +130,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.mem.usage, 'POD'), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -223,9 +221,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.cpu.total.usage, 'POD')), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -316,9 +312,7 @@
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.iface.*.in_bytes), 7, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -408,9 +402,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.iface.*.out_bytes), 7, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -501,9 +493,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{pod_name}}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.diskio.*.reads, 'POD')), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -591,9 +581,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.diskio.*.writes, 'POD')), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],

diff --git a/dist/dashboards/kubernetes-node.json b/dist/dashboards/kubernetes-node.json
@@ -380,7 +380,6 @@
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
-          "target": "alias(averageSeries(snap.$cluster.$node.intel.procfs.load.min1_rel), 'short term')",
           "textEditor": false
         }
       ],
@@ -442,8 +441,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ nodename }} free",
-          "refId": "B",
-          "target": "aliasSub(groupByNode(snap.$cluster.$node.intel.procfs.filesystem.rootfs.space_used, 2, 'maxSeries'), '(.*)', '\\1 Usage')"
+          "refId": "B"
         },
         {
           "expr": "(sum(node_filesystem_size{nodename=~\"$node\"}) by (nodename) - sum(node_filesystem_free) by (nodename))",
@@ -536,18 +534,14 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Read",
-          "refId": "A",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.*.rkB_per_sec), 'Read Bps')",
-          "textEditor": false
+          "refId": "A"
         },
         {
           "expr": "sum(rate(node_disk_bytes_written{nodename=~\"$node\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Write",
-          "refId": "B",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.*.wkB_per_sec), 'Write Bps')",
-          "textEditor": false
+          "refId": "B"
         }
       ],
       "thresholds": [],
@@ -630,18 +624,14 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Reads",
-          "refId": "A",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.ALL.r_per_sec), 'rIOPS')",
-          "textEditor": false
+          "refId": "A"
         },
         {
           "expr": "sum(rate(node_disk_writes_completed{nodename=~\"$node\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Writes",
-          "refId": "B",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.ALL.w_per_sec), 'wIOPS')",
-          "textEditor": false
+          "refId": "B"
         }
       ],
       "thresholds": [],
@@ -919,18 +909,14 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "receive",
-          "refId": "A",
-          "target": "alias(sumSeries(perSecond(snap.$cluster.$node.intel.procfs.iface.{eth*,en*}.packets_recv)), 'in')",
-          "textEditor": false
+          "refId": "A"
         },
         {
           "expr": "sum(rate(node_network_transmit_packets{nodename=~\"$node\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "transmit",
-          "refId": "B",
-          "target": "alias(sumSeries(perSecond(snap.$cluster.$node.intel.procfs.iface.{eth*,en*}.packets_sent)), 'out')",
-          "textEditor": false
+          "refId": "B"
         }
       ],
       "thresholds": [],

diff --git a/src/components/clusters/clusterConfig.js b/src/components/clusters/clusterConfig.js
@@ -141,9 +141,9 @@ export class ClusterConfigCtrl {
 
   deploy() {
     var question = !this.prometheusDeployed ?
-      'This action will deploy a DaemonSet to your Kubernetes cluster. It uses Intel Snap to collect health metrics. ' +
+      'This action will deploy Prometheus exporters to your Kubernetes cluster.' +
       'Are you sure you want to deploy?' :
-      'This action will update the Config Map for the Snap DaemonSet and recreate the snapd pod on your Kubernetes cluster. ' +
+      'This action will update the Prometheus exporters on your Kubernetes cluster. ' +
       'Are you sure you want to deploy?';
     appEvents.emit('confirm-modal', {
       title: 'Deploy to Kubernetes Cluster',
@@ -324,7 +324,7 @@ export class ClusterConfigCtrl {
         this.alertSrv.set("Error", err, 'error');
       }).then(() => {
         this.prometheusDeployed = true;
-        this.alertSrv.set("Deployed", "Snap DaemonSet for Kubernetes metrics deployed to " + self.cluster.name, 'success', 5000);
+        this.alertSrv.set("Deployed", "Prometheus and exporters have been deployed to " + self.cluster.name, 'success', 5000);
       });
   }
 
@@ -357,7 +357,7 @@ export class ClusterConfigCtrl {
       })
       .then(() => {
         this.prometheusDeployed = false;
-        this.alertSrv.set("Daemonset removed", "Snap DaemonSet for Kubernetes metrics removed from " + self.cluster.name, 'success', 5000);
+        this.alertSrv.set("Grafana K8s removed", "Prometheus and exporters removed from " + self.cluster.name, 'success', 5000);
       });
   }
 

diff --git a/src/components/config/config.html b/src/components/config/config.html
@@ -1,5 +1,5 @@
 <h3 class="page-heading">Kubernetes App</h3>
-This app integrates the data collected from <a href="https://hub.docker.com/r/raintank/snap_k8s/" target="_blank">Snap running in Kubernetes</a> with data available via the Kubernetes API.
+This app integrates the data collected from <a href="https://github.com/google/cadvisor" target="_blank">Kubelet</a>, <a href="https://github.com/kubernetes/kube-state-metrics" target="_blank">Kube-State Metrics</a>, and <a href="https://github.com/prometheus/node_exporter" target="_blank">Node Exporter</a> with data available via the Kubernetes API.
 <div class="pluginconfig-message" ng-if="ctrl.appModel.enabled">
-  <i class="icon-gf icon-gf-check k8s-icon-success"></i> Dashboards imported. <strong>Next up: </strong><a href="plugins/raintank-kubernetes-app/page/cluster-config" class="external-link">Connect to your Kubernetes Cluster and deploy metric collectors</a>
+  <i class="icon-gf icon-gf-check k8s-icon-success"></i> Dashboards imported. <strong>Next up: </strong><a href="plugins/raintank-kubernetes-app/page/cluster-config" class="external-link">Connect to your Kubernetes Cluster and deploy metric exporters</a>
 </div>
diff --git a/src/dashboards/kubernetes-container.json b/src/dashboards/kubernetes-container.json
@@ -130,9 +130,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.mem.usage, 'POD'), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -223,9 +221,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.cpu.total.usage, 'POD')), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -316,9 +312,7 @@
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.iface.*.in_bytes), 7, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -408,9 +402,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.iface.*.out_bytes), 7, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -501,9 +493,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{pod_name}}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.diskio.*.reads, 'POD')), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],
@@ -591,9 +581,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ pod_name }}",
-          "refId": "A",
-          "target": "groupByNode(perSecond(exclude(snap.$cluster.$node.grafanalabs.cadvisor.container.$namespace.$pod.*.diskio.*.writes, 'POD')), 8, 'sum')",
-          "textEditor": false
+          "refId": "A"
         }
       ],
       "thresholds": [],

diff --git a/src/dashboards/kubernetes-node.json b/src/dashboards/kubernetes-node.json
@@ -380,7 +380,6 @@
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
-          "target": "alias(averageSeries(snap.$cluster.$node.intel.procfs.load.min1_rel), 'short term')",
           "textEditor": false
         }
       ],
@@ -442,8 +441,7 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ nodename }} free",
-          "refId": "B",
-          "target": "aliasSub(groupByNode(snap.$cluster.$node.intel.procfs.filesystem.rootfs.space_used, 2, 'maxSeries'), '(.*)', '\\1 Usage')"
+          "refId": "B"
         },
         {
           "expr": "(sum(node_filesystem_size{nodename=~\"$node\"}) by (nodename) - sum(node_filesystem_free) by (nodename))",
@@ -536,18 +534,14 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Read",
-          "refId": "A",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.*.rkB_per_sec), 'Read Bps')",
-          "textEditor": false
+          "refId": "A"
         },
         {
           "expr": "sum(rate(node_disk_bytes_written{nodename=~\"$node\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Write",
-          "refId": "B",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.*.wkB_per_sec), 'Write Bps')",
-          "textEditor": false
+          "refId": "B"
         }
       ],
       "thresholds": [],
@@ -630,18 +624,14 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Reads",
-          "refId": "A",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.ALL.r_per_sec), 'rIOPS')",
-          "textEditor": false
+          "refId": "A"
         },
         {
           "expr": "sum(rate(node_disk_writes_completed{nodename=~\"$node\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Writes",
-          "refId": "B",
-          "target": "alias(sumSeries(snap.$cluster.$node.intel.iostat.device.ALL.w_per_sec), 'wIOPS')",
-          "textEditor": false
+          "refId": "B"
         }
       ],
       "thresholds": [],
@@ -919,18 +909,14 @@
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "receive",
-          "refId": "A",
-          "target": "alias(sumSeries(perSecond(snap.$cluster.$node.intel.procfs.iface.{eth*,en*}.packets_recv)), 'in')",
-          "textEditor": false
+          "refId": "A"
         },
         {
           "expr": "sum(rate(node_network_transmit_packets{nodename=~\"$node\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "transmit",
-          "refId": "B",
-          "target": "alias(sumSeries(perSecond(snap.$cluster.$node.intel.procfs.iface.{eth*,en*}.packets_sent)), 'out')",
-          "textEditor": false
+          "refId": "B"
         }
       ],
       "thresholds": [],