Merge branch 'master' into issue/6556

stormpython · stormpython · commit da025aaca927 · 2016-03-24T15:45:12.000-07:00
diff --git a/config/kibana.yml b/config/kibana.yml
@@ -11,6 +11,9 @@
 # The maximum payload size in bytes for incoming server requests.
 # server.maxPayloadBytes: 1048576
 
+# The Kibana server's name.  This is used for display purposes.
+# server.name: "your-hostname"
+
 # The URL of the Elasticsearch instance to use for all your queries.
 # elasticsearch.url: "http://localhost:9200"
 
diff --git a/src/plugins/kibana/public/settings/sections/about/index.html b/src/plugins/kibana/public/settings/sections/about/index.html
@@ -21,6 +21,11 @@ <h1>Kibana</h1>
               <td>{{buildSha | limitTo:7}}</td>
             </tr>
 
+            <tr>
+              <td>Server name</td>
+              <td>{{serverName}}</td>
+            </tr>
+
           </table>
         </p>
         <small>© 2015 All Rights Reserved - <a href="https://elastic.co">Elasticsearch</a></small>
diff --git a/src/plugins/kibana/public/settings/sections/about/index.js b/src/plugins/kibana/public/settings/sections/about/index.js
@@ -10,10 +10,11 @@ uiRoutes
 });
 
 uiModules.get('apps/settings')
-.controller('settingsAbout', function ($scope, kbnVersion, buildNum, buildSha) {
+.controller('settingsAbout', function ($scope, kbnVersion, buildNum, buildSha, serverName) {
   $scope.kbnVersion = kbnVersion;
   $scope.buildNum = buildNum;
   $scope.buildSha = buildSha;
+  $scope.serverName = serverName;
 });
 
 registry.register(_.constant({
diff --git a/src/plugins/status_page/public/status_page.html b/src/plugins/status_page/public/status_page.html
@@ -3,6 +3,9 @@
     <h1>
       Status: <span class="state_color">{{ ui.serverStateMessage }}</span>
       <i class="fa state_color state_icon" />
+      <span class="pull-right">
+        {{ ui.name }}
+      </span>
     </h1>
   </header>
 
diff --git a/src/plugins/status_page/public/status_page.js b/src/plugins/status_page/public/status_page.js
@@ -29,6 +29,7 @@ const chrome = require('ui/chrome')
       const data = resp.data;
       ui.metrics = data.metrics;
       ui.statuses = data.status.statuses;
+      ui.name = data.name;
 
       const overall = data.status.overall;
       if (!ui.serverState || (ui.serverState !== overall.state)) {
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { get } from 'lodash';
 import { randomBytes } from 'crypto';
+import os from 'os';
 
 import fromRoot from '../../utils/from_root';
 
@@ -29,6 +30,7 @@ module.exports = () => Joi.object({
   }).default(),
 
   server: Joi.object({
+    name: Joi.string().default(os.hostname()),
     host: Joi.string().hostname().default('0.0.0.0'),
     port: Joi.number().default(5601),
     maxPayloadBytes: Joi.number().default(1048576),
diff --git a/src/server/status/index.js b/src/server/status/index.js
@@ -14,6 +14,7 @@ module.exports = function (kbnServer, server, config) {
     path: '/api/status',
     handler: function (request, reply) {
       return reply({
+        name: config.get('server.name'),
         status: kbnServer.status.toJSON(),
         metrics: kbnServer.metrics
       });
diff --git a/src/ui/index.js b/src/ui/index.js
@@ -67,6 +67,7 @@ module.exports = async (kbnServer, server, config) => {
       buildNum: config.get('pkg.buildNum'),
       buildSha: config.get('pkg.buildSha'),
       basePath: config.get('server.basePath'),
+      serverName: config.get('server.name'),
       vars: defaults(app.getInjectedVars() || {}, uiExports.defaultInjectedVars),
     };
 
diff --git a/src/ui/public/chrome/api/angular.js b/src/ui/public/chrome/api/angular.js
@@ -17,6 +17,7 @@ module.exports = function (chrome, internals) {
     .value('kbnVersion', internals.version)
     .value('buildNum', internals.buildNum)
     .value('buildSha', internals.buildSha)
+    .value('serverName', internals.serverName)
     .value('sessionId', Date.now())
     .value('chrome', chrome)
     .value('esUrl', (function () {
diff --git a/src/ui/public/notify/directives.js b/src/ui/public/notify/directives.js
@@ -1,6 +1,8 @@
 import _ from 'lodash';
 import uiModules from 'ui/modules';
 import toasterTemplate from 'ui/notify/partials/toaster.html';
+import 'ui/notify/notify.less';
+
 var notify = uiModules.get('kibana/notify');
 
 notify.directive('kbnNotifications', function () {
diff --git a/src/ui/public/notify/notify.less b/src/ui/public/notify/notify.less
@@ -8,6 +8,24 @@
     margin: 0;
     padding: 0;
     list-style: none;
+
+    &-countdown {
+      .badge {
+        color: @white;
+      }
+
+      &:hover {
+        .badge {
+          font-size: 0;
+        }
+
+        .badge:after {
+          font-size: @font-size-small;
+          content: attr(hover-text);
+        }
+      }
+    }
+
   }
 
   .alert {
diff --git a/src/ui/public/notify/partials/toaster.html b/src/ui/public/notify/partials/toaster.html
@@ -12,10 +12,11 @@
           <button
             type="button"
             ng-if="notif.isTimed()"
-            class="btn btn-sm"
+            class="btn toaster-countdown"
             ng-class="'btn-' + notif.type"
             ng-click="notif.cancelTimer()"
-            >Auto-closing in {{notif.timeRemaining}}</button>
+
+            ><span class="badge" hover-text="stop">{{notif.timeRemaining}}s</span></button>
           <button
             type="button"
             ng-if="notif.stack && !notif.showStack"
