Merge pull request #174 from firstandthird/prom-defaults

working
firstandthird · Oct 16, 2018 · 12a3151 · 12a3151
2 parents 845c50c + 11430bb
commit 12a3151
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/conf/default-envs.yaml b/conf/default-envs.yaml
@@ -5,6 +5,7 @@ envVars:
   routePrefix: "{{ getEnv('ROUTE_PREFIX', getEnv('PATH_PREFIX', '')) }}"
   healthToken: "{{ getEnv('HEALTH_TOKEN', false) }}"
   enableProm: '{{ truthy(ENV.ENABLE_PROM)}}'
+  promDefaults: '{{ truthy(ENV.PROM_DEFAULTS)}}'
   promPath: "{{ getEnv('PROM_PATH', '/metrics') }}"
   forceHttps: '{{ truthy(getEnv("FORCE_HTTPS", false)) }}'
   logRequests: '{{ truthy(ENV.ACCESS_LOGS) }}'

diff --git a/conf/default.yaml b/conf/default.yaml
@@ -23,6 +23,7 @@ plugins:
   hapi-prom:
     _enabled: "{{ envVars.enableProm }}"
     metricsPath: "{{ envVars.promPath }}"
+    defaultMetrics: "{{ envVars.promDefaults}}"
   hapi-logr:
     unhandledRejection: true
     uncaughtException: true

diff --git a/test/initialize.test.js b/test/initialize.test.js
@@ -85,6 +85,7 @@ tap.test('server stops when SIGTERM event is emitted ', async t => {
 
 tap.test('be able to conditionally load hapi-prom', async t => {
   process.env.ENABLE_PROM = true;
+  process.env.PROM_DEFAULTS = true;
   const rapptor = new Rapptor({
     cwd: __dirname,
   });
@@ -94,6 +95,7 @@ tap.test('be able to conditionally load hapi-prom', async t => {
     url: '/metrics'
   });
   t.equal(response.statusCode, 200, 'registers hapi-prom route');
+  t.match(response.result, 'nodejs_heap_space_size_total_bytes', 'ENV.PROM_DEFAULTS registers default metrics');
   await rapptor.stop();
   t.end();
 });