kibana-sinatra 0.0.2 → 0.0.3

data/lib/kibana/assets/app/dashboards/guided.json

@@ -42,7 +42,7 @@
       "panels": [
         {
           "error": false,
-          "span": 8,
+          "span": 7,
           "editable": true,
           "group": [
             "default"
@@ -50,39 +50,13 @@
           "type": "text",
           "status": "Stable",
           "mode": "markdown",
-          "content": "If you have a field with a timestamp in it, you might want to add a 'timepicker' panel here. Click the plus sign over to the right to do so. You can also remove these information text panels there by clicking the 'x' icon above",
+          "content": "If you have a field with a timestamp in it, you can set a time filter using the control in the navigation bar. You'll need to click the cog icon to configure the field that your timestamp is in.",
           "style": {},
           "title": "Have a timestamp somewhere?"
-        }
-      ]
-    },
-    {
-      "title": "Query",
-      "height": "50px",
-      "editable": true,
-      "collapse": false,
-      "collapsable": true,
-      "panels": [
-        {
-          "error": false,
-          "span": 5,
-          "editable": true,
-          "group": [
-            "default"
-          ],
-          "type": "query",
-          "label": "Search",
-          "history": [
-            "*"
-          ],
-          "remember": 10,
-          "pinned": true,
-          "query": "*",
-          "title": "Search"
         },
         {
           "error": false,
-          "span": 7,
+          "span": 5,
           "editable": true,
           "group": [
             "default"
@@ -90,29 +64,12 @@
           "type": "text",
           "status": "Stable",
           "mode": "markdown",
-          "content": "See the *Filters* bar to the below? Click it to expand the filters row. Right now there are none. click on one of the icons in the document types list to filter down to only that document type",
+          "content": "See the *Filters* bar above? Click it to expand the filters panel. Right now there are none. click on one of the icons in the document types list to filter down to only that document type",
           "style": {},
           "title": "About filters"
         }
-      ]
-    },
-    {
-      "title": "Filters",
-      "height": "50px",
-      "editable": true,
-      "collapse": true,
-      "collapsable": true,
-      "panels": [
-        {
-          "error": false,
-          "span": 12,
-          "editable": true,
-          "group": [
-            "default"
-          ],
-          "type": "filtering"
-        }
-      ]
+      ],
+      "notice": false
     },
     {
       "title": "Graph",
@@ -199,7 +156,8 @@
           "style": {},
           "title": "The most generic dashboard ever"
         }
-      ]
+      ],
+      "notice": false
     },
     {
       "title": "Events",
@@ -245,7 +203,8 @@
           "normTimes": true,
           "title": "Documents"
         }
-      ]
+      ],
+      "notice": false
     }
   ],
   "editable": true,
@@ -270,5 +229,54 @@
     "load_elasticsearch_size": 20,
     "load_local": true,
     "hide": false
-  }
+  },
+  "pulldowns": [
+    {
+      "type": "query",
+      "collapse": false,
+      "notice": false,
+      "query": "*",
+      "pinned": true,
+      "history": [],
+      "remember": 10
+    },
+    {
+      "type": "filtering",
+      "collapse": true,
+      "notice": false
+    }
+  ],
+  "nav": [
+    {
+      "type": "timepicker",
+      "collapse": false,
+      "notice": false,
+      "status": "Stable",
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ],
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "timefield": "@timestamp"
+    }
+  ],
+  "refresh": false
 }

data/lib/kibana/assets/app/dashboards/logstash.js

@@ -1,4 +1,4 @@
-/* global _, kbn */
+/* global _ */
 
 /*
  * Complex scripted Logstash dashboard
@@ -29,7 +29,7 @@ var dashboard, queries, _d_timespan;
 var ARGS;
 
 // Set a default timespan if one isn't specified
-_d_timespan = '1h';
+_d_timespan = '1d';
 
 // Intialize a skeleton with nothing but a rows array and service object
 dashboard = {
@@ -85,12 +85,11 @@ dashboard.services.query = {
 };
 
 // Lets also add a default time filter, the value of which can be specified by the user
-// This isn't strictly needed, but it gets rid of the info alert about the missing time filter
 dashboard.services.filter = {
   list: {
     0: {
-      from: kbn.time_ago(ARGS.from||_d_timespan),
-      to: new Date(),
+      from: "now-"+(ARGS.from||_d_timespan),
+      to: "now",
       field: ARGS.timefield||"@timestamp",
       type: "time",
       active: true,
@@ -102,19 +101,6 @@ dashboard.services.filter = {
 
 // Ok, lets make some rows. The Filters row is collapsed by default
 dashboard.rows = [
-  {
-    title: "Time span",
-    height: "30px"
-  },
-  {
-    title: "Query",
-    height: "30px"
-  },
-  {
-    title: "Filters",
-    height: "100px",
-    collapse: true
-  },
   {
     title: "Chart",
     height: "300px"
@@ -125,37 +111,8 @@ dashboard.rows = [
   }
 ];
 
-// Setup some panels. A query panel and a filter panel on the same row
-dashboard.rows[0].panels = [
-  {
-    title: "Set time filter",
-    type: 'timepicker',
-    span: 6,
-    timespan: ARGS.from||_d_timespan
-  }
-];
-
-// Add a filtering panel to the 3rd row
-dashboard.rows[1].panels = [
-  {
-    title: 'search',
-    type: 'query',
-    span: 12
-  }
-];
-
-
-// Add a filtering panel to the 3rd row
-dashboard.rows[2].panels = [
-  {
-    title: 'filters (applied globally)',
-    type: 'filtering',
-    span: 12
-  }
-];
-
 // And a histogram that allows the user to specify the interval and time field
-dashboard.rows[3].panels = [
+dashboard.rows[0].panels = [
   {
     title: 'events over time',
     type: 'histogram',
@@ -166,7 +123,7 @@ dashboard.rows[3].panels = [
 ];
 
 // And a table row where you can specify field and sort order
-dashboard.rows[4].panels = [
+dashboard.rows[1].panels = [
   {
     title: 'all events',
     type: 'table',

data/lib/kibana/assets/app/dashboards/logstash.json

@@ -10,7 +10,9 @@
           "query": "{{ARGS.query || '*'}}",
           "alias": "",
           "color": "#7EB26D",
-          "id": 0
+          "id": 0,
+          "pin": false,
+          "type": "lucene"
         }
       },
       "ids": [
@@ -23,10 +25,10 @@
       ],
       "list": {
         "0": {
-          "from": "2013-07-30T18:58:13.977Z",
-          "to": "2013-07-30T19:58:13.977Z",
-          "field": "@timestamp",
           "type": "time",
+          "field": "@timestamp",
+          "from": "now-{{ARGS.from || '24h'}}",
+          "to": "now",
           "mandate": "must",
           "active": true,
           "alias": "",
@@ -39,90 +41,6 @@
     }
   },
   "rows": [
-    {
-      "title": "Options",
-      "height": "50px",
-      "editable": true,
-      "collapse": false,
-      "collapsable": true,
-      "panels": [
-        {
-          "title": "Set time span",
-          "error": "",
-          "span": 6,
-          "editable": true,
-          "group": [
-            "default"
-          ],
-          "type": "timepicker",
-          "mode": "relative",
-          "time_options": [
-            "5m",
-            "15m",
-            "1h",
-            "6h",
-            "12h",
-            "24h",
-            "2d",
-            "7d",
-            "30d"
-          ],
-          "timespan": "{{ARGS.from || '1h'}}",
-          "timefield": "@timestamp",
-          "timeformat": "",
-          "refresh": {
-            "enable": false,
-            "interval": 30,
-            "min": 3
-          },
-          "filter_id": 0,
-          "status": "Stable"
-        }
-      ]
-    },
-    {
-      "title": "Query",
-      "height": "50px",
-      "editable": true,
-      "collapse": false,
-      "collapsable": true,
-      "panels": [
-        {
-          "title": "Search",
-          "error": false,
-          "span": 12,
-          "editable": true,
-          "group": [
-            "default"
-          ],
-          "type": "query",
-          "label": "Search",
-          "history": [],
-          "remember": 10,
-          "pinned": true,
-          "query": "*"
-        }
-      ]
-    },
-    {
-      "title": "Filters",
-      "height": "50px",
-      "editable": true,
-      "collapse": true,
-      "collapsable": true,
-      "panels": [
-        {
-          "title": "dashboard filters",
-          "error": false,
-          "span": 12,
-          "editable": true,
-          "group": [
-            "default"
-          ],
-          "type": "filtering"
-        }
-      ]
-    },
     {
       "title": "Graph",
       "height": "350px",
@@ -142,7 +60,7 @@
           "value_field": null,
           "auto_int": true,
           "resolution": 100,
-          "interval": "30s",
+          "interval": "10m",
           "fill": 3,
           "linewidth": 3,
           "timezone": "browser",
@@ -163,9 +81,30 @@
               0
             ]
           },
-          "title": "Events over time"
+          "title": "Events over time",
+          "intervals": [
+            "auto",
+            "1s",
+            "1m",
+            "5m",
+            "10m",
+            "30m",
+            "1h",
+            "3h",
+            "12h",
+            "1d",
+            "1w",
+            "1M",
+            "1y"
+          ],
+          "options": true,
+          "tooltip": {
+            "value_type": "cumulative",
+            "query_as_alias": false
+          }
         }
-      ]
+      ],
+      "notice": false
     },
     {
       "title": "Events",
@@ -207,9 +146,12 @@
             ]
           },
           "field_list": true,
-          "status": "Stable"
+          "status": "Stable",
+          "trimFactor": 300,
+          "normTimes": true
         }
-      ]
+      ],
+      "notice": false
     }
   ],
   "editable": true,
@@ -218,5 +160,72 @@
     "interval": "day",
     "pattern": "[logstash-]YYYY.MM.DD",
     "default": "NO_TIME_FILTER_OR_INDEX_PATTERN_NOT_MATCHED"
-  }
-}
+  },
+  "style": "dark",
+  "panel_hints": true,
+  "pulldowns": [
+    {
+      "type": "query",
+      "collapse": false,
+      "notice": false,
+      "query": "*",
+      "pinned": true,
+      "history": [],
+      "remember": 10
+    },
+    {
+      "type": "filtering",
+      "collapse": true,
+      "notice": false
+    }
+  ],
+  "nav": [
+    {
+      "type": "timepicker",
+      "collapse": false,
+      "notice": false,
+      "status": "Stable",
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ],
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "timefield": "@timestamp",
+      "now": true,
+      "filter_id": 0
+    }
+  ],
+  "loader": {
+    "save_gist": false,
+    "save_elasticsearch": true,
+    "save_local": true,
+    "save_default": true,
+    "save_temp": true,
+    "save_temp_ttl_enable": true,
+    "save_temp_ttl": "30d",
+    "load_gist": true,
+    "load_elasticsearch": true,
+    "load_elasticsearch_size": 20,
+    "load_local": true,
+    "hide": false
+  },
+  "refresh": false
+}