Merge b5e5422 into a667e3d

commands/status.js

@@ -9,7 +9,10 @@ async function handler(slackPayload, match) {
   if (response.statusCode !== 200) {
     throw boom.badImplementation(response.statusMessage);
   }
+  const settings = this.server.settings.app.slack;
   const send = {
+    username: settings.name,
+    icon_emoji: settings.emoji,
     response_type: 'in_channel',
     text: 'Server Statuses',
     attachments: []

conf/default-envs.yaml

@@ -0,0 +1,16 @@
+envVars:
+  userAgent: '{{getEnv("USER_AGENT", "healthcheck")}}'
+  logPath: '{{getEnv("LOG_PATH", "")}}'
+  slack:
+    name: '{{getEnv("SLACK_NAME", "Healthcheck")}}'
+    emoji: '{{getEnv("SLACK_EMOJI", ":warning:")}}'
+    channel: '{{ENV.SLACK_CHANNEL || undefined}}'
+    hook: '{{ENV.SLACK_HOOK}}'
+    enabled: '{{envExists("SLACK_HOOK")}}'
+    commandToken: '{{getEnv("SLACK_TOKEN", false)}}'
+  sns:
+    region: '{{ ENV.AWS_DEFAULT_REGION }}'
+    clientId: '{{ ENV.AWS_ACCESS_KEY_ID }}'
+    secretId: '{{ ENV.AWS_SECRET_ACCESS_KEY }}'
+    topic: '{{ ENV.SNS_TOPIC }}'
+    enabled: '{{envExists("SNS_TOPIC")}}'

conf/default-plugins.yaml

@@ -4,6 +4,7 @@ plugins:
     token: '{{slack.commandToken}}'
     commandDir: '{{CWD}}/commands'
     callbackDir: '{{CWD}}/callbacks'
+    name: '{{slack.name}}'
   hapi-method-loader:
     _dependencies:
       - 'hapi-method-scheduler'
@@ -59,7 +60,7 @@ plugins:
           enabled: '{{slack.enabled}}'
           throttle: '{{1000 * 60 * 10}}'
           throttleBasedOnTags: true
-          username: 'HealthCheck'
+          username: '{{slack.name}}'
           hideTags: true
           slackHook: '{{slack.hook}}'
           tagColors:

conf/default.yaml

@@ -3,17 +3,18 @@ interval: 'every 10 seconds'
 retryDelay: 1000
 verbose: false
 ua: 'healthcheck'
-userAgent: '{{getEnv("USER_AGENT", "")}}'
-logPath: '{{ENV.LOG_PATH}}'
+userAgent: '{{ envVars.userAgent }}'
+logPath: '{{envVars.logPath}}'
 slack:
-  emoji: '{{getEnv("SLACK_EMOJI", ":warning:")}}'
-  channel: '{{ENV.SLACK_CHANNEL || undefined}}'
-  hook: '{{ENV.SLACK_HOOK}}'
+  name: '{{envVars.slack.name}}'
+  emoji: '{{envVars.slack.emoji}}'
+  channel: '{{envVars.slack.channel}}'
+  hook: '{{envVars.slack.hook}}'
   enabled: '{{envExists("SLACK_HOOK")}}'
-  commandToken: '{{getEnv("SLACK_TOKEN", false)}}'
+  commandToken: '{{envVars.slack.commandToken}}'
 sns:
-  region: '{{ ENV.AWS_DEFAULT_REGION }}'
-  clientId: '{{ ENV.AWS_ACCESS_KEY_ID }}'
-  secretId: '{{ ENV.AWS_SECRET_ACCESS_KEY }}'
-  topic: '{{ ENV.SNS_TOPIC }}'
+  region: '{{ envVars.region }}'
+  clientId: '{{ envVars.clientId }}'
+  secretId: '{{ envVars.secretId }}'
+  topic: '{{ envVars.topic }}'
   enabled: '{{envExists("SNS_TOPIC")}}'

conf/test.yaml

@@ -4,3 +4,9 @@ urls:
     url: http://localhost:8080/test/http
     type: http
     interval: 'every 2 seconds'
+certificates:
+  -
+    name: 'http2'
+    url: http://localhost:8080/test/http
+    type: http
+    interval: 'every 2 seconds'