95 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Khalah Jones-Golden	d1215557a4	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@6122e58418	2015-08-24 19:56:42 -04:00
Chris Cowan	e7761d75ea	Fixing schema ... Original commit: elastic/x-pack-elasticsearch@844479ccd3	2015-08-24 16:48:57 -07:00
Khalah Jones-Golden	76abcea205	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@abe129b09c	2015-08-24 15:05:19 -04:00
Khalah Jones-Golden	f8f0fc0c54	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@c198f64c57	2015-08-20 18:21:13 -04:00
Chris Cowan	dc6073bf8f	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel ... Original commit: elastic/x-pack-elasticsearch@dd12d37034	2015-08-20 10:14:37 -07:00
Chris Cowan	8b90d91395	Merge pull request elastic/elasticsearch#471 from panda01/master ... A whole bunch of uddates and such Original commit: elastic/x-pack-elasticsearch@02751b9b78	2015-08-20 10:13:53 -07:00
Khalah Jones-Golden	90a0fb7ae6	Merge remote-tracking branch 'origin/master' ... Original commit: elastic/x-pack-elasticsearch@920d3b12f6	2015-08-19 23:14:09 -04:00
Khalah Jones-Golden	01e88961f4	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@f7d4238cc7	2015-08-19 19:44:49 -04:00
Khalah Jones-Golden	1d097c8d0e	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@af34624581	2015-08-19 17:12:53 -04:00
Khalah Jones-Golden	c66db74f85	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@cf7324bdb8	2015-08-19 12:09:47 -04:00
Chris Cowan	e8f13f50b8	Changing cluster_name to cluster_uuid ... Original commit: elastic/x-pack-elasticsearch@7b5227a0a7	2015-08-18 12:33:17 -07:00
Chris Cowan	0eb0e701e4	Adding cluster home screen; cleaning up cluster_state; removing cluster_state service ... Original commit: elastic/x-pack-elasticsearch@0dc010a7b7	2015-08-17 11:20:32 -07:00
Khalah Jones-Golden	9273b726ee	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@3f2ac65458	2015-08-12 20:10:08 -04:00
Khalah Jones-Golden	f2e3b40e1a	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@9257e7083f	2015-08-11 15:04:33 -04:00
Chris Cowan	ff72c743d0	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel ... Original commit: elastic/x-pack-elasticsearch@bc98d9dfe0	2015-08-10 13:34:30 -07:00
Chris Cowan	1a37d1d615	Merge pull request elastic/elasticsearch#473 from simianhacker/upgrade-kibana ... Upgrade kibana Original commit: elastic/x-pack-elasticsearch@3770f0fbb4	2015-08-10 13:18:19 -07:00
Chris Cowan	b9f0574b0d	adding license doc to sample data ... Original commit: elastic/x-pack-elasticsearch@c3232fed07	2015-08-10 12:50:09 -07:00
Chris Cowan	c21ca69acd	Moving everythign to the new data format ... Original commit: elastic/x-pack-elasticsearch@b35c192536	2015-08-06 15:30:05 -07:00
Khalah Jones-Golden	f8973c8a3d	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@2cb9ffa5cb	2015-08-06 09:59:39 -04:00
Chris Cowan	86ebd14587	Movign to the new Kibana ... Original commit: elastic/x-pack-elasticsearch@a943185e94	2015-08-04 10:41:44 -07:00
Chris Cowan	a5b91ff780	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel ... Original commit: elastic/x-pack-elasticsearch@f721a1b2f1	2015-07-30 12:50:30 -07:00
Chris Cowan	a779ac8100	Adding indexer and optimizing shard allocations ... Original commit: elastic/x-pack-elasticsearch@146fbec575	2015-07-30 12:49:04 -07:00
Chris Cowan	f6597698fb	Merge pull request elastic/elasticsearch#462 from panda01/master ... Tables, Nodes, and Indices Original commit: elastic/x-pack-elasticsearch@090c53fcb8	2015-07-30 12:47:46 -07:00
Chris Cowan	953597e1c0	Triggering an update ... Original commit: elastic/x-pack-elasticsearch@3b03b5ec1c	2015-07-27 17:45:09 -07:00
Khalah Jones-Golden	d9939dbe64	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@ed611e3637	2015-07-27 10:12:31 -04:00
Khalah Jones-Golden	565b97ab6f	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@f425121ad8	2015-07-23 17:31:43 -04:00
Khalah Jones-Golden	ad3e31461a	Merge remote-tracking branch 'simianhacker/master' ... Original commit: elastic/x-pack-elasticsearch@2dee36a12d	2015-07-20 19:45:46 -04:00
Chris Cowan	e71843ecb8	Fixing gulpfile ... Original commit: elastic/x-pack-elasticsearch@cda37f6d85	2015-07-20 16:30:20 -07:00
Chris Cowan	4dd92cf2e8	Moving the source to app; setup jsx parsing ... Original commit: elastic/x-pack-elasticsearch@46cb23d583	2015-07-17 16:32:40 -07:00
Chris Cowan	8bba75c275	tesing build ... Original commit: elastic/x-pack-elasticsearch@7697fc9dff	2015-07-17 14:40:48 -07:00
Chris Cowan	90e98766ac	Adding shard_allocation vis ... Original commit: elastic/x-pack-elasticsearch@081ba8aa5d	2015-07-16 13:59:09 -07:00
Chris Cowan	c43433d580	Merge pull request elastic/elasticsearch#443 from simianhacker/feature/issues ... Issues Feature Original commit: elastic/x-pack-elasticsearch@cefd91100d	2015-06-25 11:15:19 -07:00
Chris Cowan	6c3052d1ab	Merge pull request elastic/elasticsearch#437 from panda01/master ... Chart and Cluster Status Directives Original commit: elastic/x-pack-elasticsearch@cd3559db33	2015-06-25 11:14:39 -07:00
Chris Cowan	e67359ca09	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into feature/issues ... Original commit: elastic/x-pack-elasticsearch@907dc62b0c	2015-06-25 10:15:25 -07:00
Khalah Jones-Golden	b6531876fb	[Merge] Merged with latest master ... Original commit: elastic/x-pack-elasticsearch@b622a9e74b	2015-06-23 18:02:42 -04:00
Khalah Jones Golden	cf6f4422e1	Merge pull request elastic/elasticsearch#438 from simianhacker/master ... Refactor Plugin Layout and Settings Original commit: elastic/x-pack-elasticsearch@c5d8fa0219	2015-06-23 16:51:27 -04:00
Chris Cowan	03380b74e0	Refactor plugin layout; add settings; start issues work ... Original commit: elastic/x-pack-elasticsearch@dae4d50d49	2015-06-23 13:45:52 -07:00
Chris Cowan	72730d3d9c	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel ... Original commit: elastic/x-pack-elasticsearch@00b1faab97	2015-06-12 10:24:28 -07:00
Chris Cowan	a480d5ab70	Merge pull request elastic/elasticsearch#412 from simianhacker/watchers ... Watchers Original commit: elastic/x-pack-elasticsearch@0c1ecda21c	2015-06-11 15:08:47 -07:00
Chris Cowan	1559bdfc26	removing stuff from README ... Original commit: elastic/x-pack-elasticsearch@801c5d8eb4	2015-06-01 14:05:43 -07:00
Chris Cowan	e3538c1105	Adding some instructions to the readme ... Original commit: elastic/x-pack-elasticsearch@379b0a76c8	2015-06-01 14:04:43 -07:00
Chris Cowan	406f9da884	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into watchers ... Original commit: elastic/x-pack-elasticsearch@08fe1eb036	2015-06-01 13:57:37 -07:00
Chris Cowan	1c92b3976b	Adding fielddata utilization ... Original commit: elastic/x-pack-elasticsearch@f92ef0e38d	2015-05-20 08:57:42 -07:00
Chris Cowan	848b90a720	Adding file descriptors to watcher examples ... Original commit: elastic/x-pack-elasticsearch@9d5ee156e8	2015-05-19 14:22:10 -07:00
Chris Cowan	ca08fb731f	Adding readme to watchers ... Original commit: elastic/x-pack-elasticsearch@67177df520	2015-05-18 11:16:09 -07:00
Chris Cowan	835c92f32e	Adding dependencies ... Original commit: elastic/x-pack-elasticsearch@d24f14bedb	2015-05-18 10:54:40 -07:00
Chris Cowan	50324e231a	Adding watchers and testing framework ... Original commit: elastic/x-pack-elasticsearch@88b1619192	2015-05-18 10:16:23 -07:00
Chris Cowan	9116a2180e	Ignoring the Gruntfile.js for JSHint ... Original commit: elastic/x-pack-elasticsearch@d180e0048e	2014-05-28 10:27:00 -07:00
Chris Cowan	99f06b31a9	Save Dashboards to Elasticsearch ... - Added "show_home" option to loader - Added custom "Save" panel to navigation panels - Changed "Marvel Dashboards" to "Dashboards" - Added merge code to Navigation to merge saved dashboards into static dashboards - Splitting up functions into discrete files - Removing findDashboardByLink() method - Changed Experimental to Stable for all Marvel panels Original commit: elastic/x-pack-elasticsearch@933f031beb	2014-03-28 16:04:19 -07:00
Chris Cowan	886bb57aec	Merge remote-tracking branch 'upstream/master' into feature/issue-147 ... Original commit: elastic/x-pack-elasticsearch@bd2019549b	2014-03-12 15:29:01 -07:00