fixes

gyselroth · Feb 14, 2019 · 1379bbe · 1379bbe
1 parent 8dcfb39
commit 1379bbe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/kube/abstract.resource.ts b/src/kube/abstract.resource.ts
@@ -1,7 +1,3 @@
-import {Logger} from 'winston';
-import Icinga from '../icinga';
-import JSONStream from 'json-stream';
-
 /**
  * kubernetes hosts
  */

diff --git a/src/kube/service.ts b/src/kube/service.ts
@@ -146,7 +146,7 @@ export default class Service extends Resource {
  }
 
  let protocol = servicePort.protocol.toLowerCase();
- let port_name = servicePort.name || protocol+':'+servicePort.port;
+ let portName = servicePort.name || protocol+':'+servicePort.port;
 
  if (!port.check_command) {
  port.check_command = protocol;
@@ -155,7 +155,7 @@ export default class Service extends Resource {
 
  port['vars._kubernetes'] = true;
  port['vars.kubernetes'] = definition;
- let name = this.escapeName([definition.metadata.name, port_name].join('-'));
+ let name = this.escapeName([definition.metadata.name, portName].join('-'));
  port['display_name'] = name;
 
  this.applyService(hostname, name, serviceType, port, templates);

diff --git a/src/main.ts b/src/main.ts
@@ -24,7 +24,7 @@ async function main() {
  logger.error('failed to cleanup icinga objects', {error: err});
  });
  }
- /*
+
  if (config.kubernetes.nodes.discover) {
  kubeNode.kubeListener(() => {
  return kubeClient.apis.v1.watch.nodes.getStream();
@@ -36,7 +36,7 @@ async function main() {
  return kubeClient.apis.extensions.v1beta1.watch.ingresses.getStream();
  });
  }
- */
+
  if (config.kubernetes.volumes.discover) {
  kubeVolume.kubeListener(() => {
  return kubeClient.apis.v1.watch.persistentvolumes.getStream();