Browse Source

Merge pull request #493 from rashidkpc/master

Fix for logstash.js, updated install instructions
Rashid Khan 12 years ago
parent
commit
ebdbb8c6c2
3 changed files with 76 additions and 52 deletions
  1. 5 6
      README.md
  2. 70 45
      index.html
  3. 1 1
      src/app/dashboards/logstash.js

+ 5 - 6
README.md

@@ -17,7 +17,7 @@ The dashboard storage format has changed in Kibana 3 milestone 3. Existing dashb
 * Index configuration has been moved from the timepicker, to the main dashboard editor
 * The stringquery panel has been replaced with a more polished 'query' panel
 
-More information about Kibana 3 can be found at [http://three.kibana.org](http://three.kibana.org)  
+More information about Kibana 3 can be found at [http://www.elasticsearch.org/overview/kibana/](http://www.elasticsearch.org/overview/kibana/)  
 
 ## Overview
 
@@ -28,19 +28,19 @@ flexible and powerful
 
 ### Requirements
 * A modern web browser. The latest version of Chrome, Safari and Firefox have all been tested to 
-work. IE8 is not currently supported
+work. IE9 and greater should work. IE8 does not.
 * A webserver. No extensions are required, as long as it can serve plain html it will work
 * A browser reachable Elasticsearch server. Port 9200 must be open, or a proxy configured to allow 
 access to it.
 
 ### Installation
 
-1. Copy the entire Kibana directory to your webserver
-2. Edit config.js to point to your elasticsearch server. This should __not be 
+1. Copy the contents of the dist/ directory to your webserver
+2. Edit config.js in your deployed directory to point to your elasticsearch server. This should __not be 
 http://localhost:9200__, but rather the fully qualified domain name of your elasticsearch server. 
 The url entered here _must be reachable_ by your browser.
 3. Point your browser at your installation. If you're using Logstash with the default indexing 
-configuration the default Kibana dashboard should work nicely. 
+configuration the included Kibana logstash interface should work nicely. 
 
 ### FAQ
 __Q__: Why doesnt it work? I have http://localhost:9200 in my config.js, my webserver and elasticsearch
@@ -55,5 +55,4 @@ __A__: A simple nginx virtual host and proxy configuration can be found in the s
 
 ### Support
 
-Introduction videos can be found at [http://three.kibana.org/about.html](http://three.kibana.org/about.html)  
 If you have questions or comments the best place to reach me is #logstash or #elasticsearch on irc.freenode.net

+ 70 - 45
index.html

@@ -1,56 +1,81 @@
 <!DOCTYPE html>
-  <!--[if IE 8]>         <html class="no-js lt-ie9" lang="en"> <![endif]-->
-  <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width">
 
+  <head>
     <title>Kibana 3</title>
-    <link rel="stylesheet" href="common/css/timepicker.css">
-    <link rel="stylesheet" href="common/css/animate.min.css">
-    <link rel="stylesheet" href="common/css/normalize.min.css">
-    <!-- project dependency libs -->
-    <script src="common/lib/LAB.min.js"></script>
-    <script src="common/lib/underscore.min.js"></script>
-    <script src="common/lib/settings.js"></script>
-    <script src="config.js"></script>
-    <script src="js/app.js"></script>
-
-    <style>
-    </style>
+    <style>/* add your css style rules here */
+    body {
+      color:#c8c8c8;
+      background-color:#272b30;
+      font-family: 'Open Sans', sans-serif;
+    }
+    .title1 {
+      font-weight: 800;
+      line-height: .9;
+      font-size: 98px
+    }
 
-  </head>
+    .title2 {
+      font-weight: 800;
+      line-height: .9;
+      font-size: 60px
+    }
 
-  <body ng-controller="DashCtrl" ng-cloak>
+    .title3 {
+      font-weight: 800;
+      font-size: 25px;
+      line-height: 1.1;
+    }
 
-    <link rel="stylesheet" ng-href="common/css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">
-    <link rel="stylesheet" href="common/css/bootstrap-responsive.min.css">
-    <link rel="stylesheet" href="common/css/font-awesome.min.css">
+    .lowercase {
+      text-transform: lowercase;
+    }
 
-    <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last">
-      <button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>
-      <strong>{{alert.title}}</strong> <span ng-bind-html-unsafe='alert.text'></span> <div style="padding-right:10px" class='pull-right small'> {{$index + 1}} alert(s) </div>
-    </div>
-    <div class="navbar navbar-static-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <span class="brand">{{dashboard.current.title}}</span>
-          <ul class="nav" ng-show='dashboard.current.editable'>
-            <li>
-              <a href='#' bs-modal="'partials/dasheditor.html'"><i class='icon-cog pointer'></i></a>
-            </li>
-          </ul>
-          <ul class="nav pull-right" ng-controller='dashLoader' ng-init="init()" ng-include="'partials/dashLoader.html'">
-          </ul>
-        </div>
-      </div>
-    </div>
-    <div class="container-fluid main">
-      <div class="row-fluid">
-        <div ng-view></div>
-      </div>
+    .uppercase {
+      text-transform: uppercase;
+    }
+
+    .light {
+      font-weight: 200;
+    }
+
+    .big { text-transform: uppercase; margin: 0; padding: 0; }
+    .bold { font-weight: 800; }
+
+    .orange {
+      color: #FF9640;
+    }
+
+    .yellow {
+      color: #FFDD68;
+    }
+
+    .teal {
+      color: #63ABB5;
+    }
+
+    .green {
+      color: #629153;
+    }
+
+    .purple {
+      color: #645068;
+    }
+
+    .white {
+      color: #fff;
+    }
+  </style>
+  </head>
+
+  <body ng-controller="DashCtrl" ng-cloak>
+    <img src='dist/img/kibana.png' style="float:right;margin-right:30px;"><p>
+    <div class="title2">
+      <span class="orange">Oops.</span> Looks like you've upgraded from an old version
     </div>
+    <div class="title3">No worries. <span class="light">Kibana has a new build system. Now its faster and lighter than ever before.</span></div>
+    <p>
+    <div class="white title3 uppercase">To fix this</div>
+    <div class="title3 light">Instead of copying the entire kibana repository, you need only copy the contents of the <a href="dist/index.html" class="teal">dist/</a> folder. After upgrading you may need to clear your browsers cache to see all of the new features.</div>
   </body>
 
 </html>

+ 1 - 1
src/app/dashboards/logstash.js

@@ -137,7 +137,7 @@ dashboard.rows[0].panels = [
 // Add a filtering panel to the 3rd row
 dashboard.rows[1].panels = [
   {
-    type: 'Query'
+    type: 'query'
   }
 ];