fixes service account config / logger.level => log.level

gyselroth · May 31, 2018 · c659974 · c659974
1 parent 3c7c0c9
commit c659974
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -169,7 +169,7 @@ List of configurable values:
 
 |Setting|Description|Environment Variable| Default Value|
 |-------|-----------|--------------------|--------------|
-|`logger.level`|Loglevel for winston logger|`LOG_LEVEL`|`debug`|
+|`log.level`|Loglevel for winston logger|`LOG_LEVEL`|`info`|
 |`icinga.address`|Icinga2 address|`ICINGA_ADDRESS`|`127.0.01`|
 |`icinga.port`|Icinga2 API port|`ICINGA_PORT`|`5665`|
 |`icinga.apiUser`|Icinga2 API username|`ICINGA_API_USERNAME`|`admin`|

diff --git a/config.json b/config.json
@@ -1,5 +1,5 @@
 {
- "logger": {
+ "log": {
  "level": "info"
  },
  "cleanup": true,

diff --git a/kube-icinga.yaml b/kube-icinga.yaml
@@ -28,7 +28,9 @@ metadata:
  labels:
  k8s-app: kube-icinga
 rules:
-- apiGroups: [""] # "" indicates the core API group
+- apiGroups:
+ - ""
+ - extensions
  resources:
  - namespaces
  - ingresses
@@ -38,6 +40,16 @@ rules:
  - get
  - watch
  - list
+- apiGroups:
+ - extensions
+ - ""
+ resources:
+ - ingresses
+ - ingresses/status
+ verbs:
+ - get
+ - watch
+ - list
 ---
 apiVersion: v1
 kind: ServiceAccount

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/config.ts b/src/config.ts
@@ -8,8 +8,8 @@ try {
 }
 
 const config = {
- logger: {
- level: process.env.LOGGER_LEVEL || defaultConfig.logger.level || 'info',
+ log: {
+ level: process.env.LOG_LEVEL || defaultConfig.log.level || 'info',
  },
  cleanup: process.env.CLEANUP || defaultConfig.cleanup || true,
  icinga: {

diff --git a/src/logger.ts b/src/logger.ts
@@ -2,7 +2,7 @@ import * as winston from 'winston';
 import config from './config';
 
 const logger = winston.createLogger({
- level: config.logger.level,
+ level: config.log.level,
  format: winston.format.simple(),
  transports: [
  new winston.transports.Console(),