diff --git a/public/app/core/components/popover/popover.ts b/public/app/core/components/popover/popover.ts
new file mode 100644
index 00000000000..f2a413aca02
--- /dev/null
+++ b/public/app/core/components/popover/popover.ts
@@ -0,0 +1,55 @@
+///
Default data source is preselected in new
+ new panels.
+ Specify a complete HTTP url (http://your_server:8080)
+ + Your access method isDirect, this means the url
+ needs to be accessable from the browser.
+
+
+ Your access method is currently Proxy, this means the url
+ needs to be accessable from the grafana backend.
+
+ A playlist rotates through a pre-selected list of Dashboards. A Playlist can be a great way to build situational awareness, or just show off your metrics to your team or visitors.
+| - {{playlistItem.title}} + | + {{playlistItem.title}} | -+ |
| - {{playlistItem.title}} + | + {{playlistItem.title}} | -+ | {{playlistItem.title}} | -+ |
@@ -89,7 +95,10 @@
- Add
+ Save
Cancel
diff --git a/public/app/features/playlist/playlist_edit_ctrl.ts b/public/app/features/playlist/playlist_edit_ctrl.ts
index 3baa3dd3353..ea018bc0bbb 100644
--- a/public/app/features/playlist/playlist_edit_ctrl.ts
+++ b/public/app/features/playlist/playlist_edit_ctrl.ts
@@ -11,7 +11,7 @@ export class PlaylistEditCtrl {
searchQuery: string = '';
loading: boolean = false;
playlist: any = {
- interval: '10m',
+ interval: '5m',
};
playlistItems: any = [];
dashboardresult: any = [];
diff --git a/public/app/headers/common.d.ts b/public/app/headers/common.d.ts
index b66ba845827..67c8604685f 100644
--- a/public/app/headers/common.d.ts
+++ b/public/app/headers/common.d.ts
@@ -39,4 +39,12 @@ declare module 'app/core/store' {
export default store;
}
+declare module 'tether' {
+ var config: any;
+ export default config;
+}
+declare module 'tether-drop' {
+ var config: any;
+ export default config;
+}
diff --git a/public/app/plugins/datasource/elasticsearch/partials/annotations.editor.html b/public/app/plugins/datasource/elasticsearch/partials/annotations.editor.html
index 8f761b67865..1db00904c04 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/annotations.editor.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/annotations.editor.html
@@ -1,39 +1,36 @@
-
-
- Index name-
-
-
+
+
+ Index name
+
-
-
-Search query (lucene)
- |