134 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Khalah Jones Golden	55b8534d27	Merge pull request elastic/elasticsearch#535 from simianhacker/shield-integration ... Shield Integration Original commit: elastic/x-pack-elasticsearch@b7d61d994e	2015-09-24 14:50:22 -04:00
Tim Sullivan	9e02c2ece6	Merge pull request elastic/elasticsearch#552 from panda01/master ... Disable deleted indices Original commit: elastic/x-pack-elasticsearch@e014e7aae9	2015-09-24 10:09:37 -07:00
Khalah Jones-Golden	ccbaae20d8	[cleanup] used less variables, cleaned up and made more clean Contributing.md ... Original commit: elastic/x-pack-elasticsearch@724bb509ec	2015-09-24 09:21:26 -04:00
Khalah Jones-Golden	0feb382737	[Contributing] Started a contributing doc ... Original commit: elastic/x-pack-elasticsearch@3a29d1b360	2015-09-23 17:58:01 -04:00
Tim Sullivan	9b1df7d900	Merge pull request elastic/elasticsearch#548 from simianhacker/welcome-message ... Adding Welcome Message to Overview Page Original commit: elastic/x-pack-elasticsearch@997b7efdac	2015-09-23 09:37:36 -07:00
Chris Cowan	6a3ff5e8f7	Merge branch 'master' into shield-integration ... Original commit: elastic/x-pack-elasticsearch@8c443530a0	2015-09-23 09:00:00 -07:00
Tim Sullivan	7d88671aa2	Merge pull request elastic/elasticsearch#545 from simianhacker/remove-marvel-prefix ... Remove marvel_ prefix for all doc types Original commit: elastic/x-pack-elasticsearch@1251b0f009	2015-09-23 08:27:51 -07:00
Chris Cowan	d28e337689	Closes elastic/elasticsearch#534 - Remove marvel_ prefix for all doc types ... Original commit: elastic/x-pack-elasticsearch@bdea3f915f	2015-09-22 10:48:29 -07:00
Chris Cowan	f0a160000e	Merge pull request elastic/elasticsearch#531 from tsullivan/handle-missing-nodeIndex ... fix - handle missing nodeIndex on node detail page Original commit: elastic/x-pack-elasticsearch@86624d845a	2015-09-21 11:43:31 -07:00
Khalah Jones Golden	457112250d	Merge pull request elastic/elasticsearch#538 from panda01/master ... Metrics improvements Original commit: elastic/x-pack-elasticsearch@c015d6baec	2015-09-21 13:58:03 -04:00
Tim Sullivan	4a46991d62	Merge pull request elastic/elasticsearch#532 from simianhacker/index-detail-metrics ... Index Detail Metrics Original commit: elastic/x-pack-elasticsearch@e4f401080a	2015-09-21 10:07:59 -07:00
Khalah Jones Golden	e4947575f2	Merge pull request elastic/elasticsearch#525 from simianhacker/index-overview-metrics ... Index Overview Metrics Original commit: elastic/x-pack-elasticsearch@cbd82d924f	2015-09-21 07:41:39 -04:00
Tim Sullivan	b727a18dfa	Merge pull request elastic/elasticsearch#533 from panda01/master ... Some small bug fixes Original commit: elastic/x-pack-elasticsearch@2f1abb455e	2015-09-18 13:02:31 -07:00
Tim Sullivan	e7e47214f6	Merge pull request elastic/elasticsearch#523 from simianhacker/node-detail-stats ... Finalize Node Stats Original commit: elastic/x-pack-elasticsearch@a142eddd56	2015-09-18 11:56:11 -07:00
Chris Cowan	5b72d28557	Merge branch 'master' into node-detail-stats ... Original commit: elastic/x-pack-elasticsearch@30869d1556	2015-09-17 10:53:58 -07:00
Chris Cowan	a5cfeef811	Merge branch 'master' into node-detail-stats ... Original commit: elastic/x-pack-elasticsearch@ab2bc389a0	2015-09-17 09:21:27 -07:00
Chris Cowan	0fa6791690	Merge pull request elastic/elasticsearch#512 from tsullivan/pagination-component ... React Pagination component updates Original commit: elastic/x-pack-elasticsearch@59bfede078	2015-09-17 08:19:04 -07:00
Chris Cowan	2c7d57bfef	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into node-detail-stats ... Original commit: elastic/x-pack-elasticsearch@5876aa4e56	2015-09-17 08:11:43 -07:00
Chris Cowan	1a804d0438	Merge pull request elastic/elasticsearch#513 from panda01/master ... Sticky Tooltips! Original commit: elastic/x-pack-elasticsearch@620b32e388	2015-09-17 08:10:58 -07:00
Tim Sullivan	fe08ebd35f	Merge pull request elastic/elasticsearch#515 from simianhacker/cluster-state-mapping-update ... Update Cluster State Mapping Original commit: elastic/x-pack-elasticsearch@4fb88a37db	2015-09-16 11:55:51 -07:00
Chris Cowan	c6c334cfa1	Merge branch 'node-stats' into cluster-state-mapping-update ... Original commit: elastic/x-pack-elasticsearch@f6ff8a4577	2015-09-16 11:50:18 -07:00
Chris Cowan	c1d05b8ee5	Changing cluster state and fixing the indexPattern for Kibana ... Original commit: elastic/x-pack-elasticsearch@9838dd5bd7	2015-09-16 08:42:03 -07:00
Chris Cowan	8b1a491213	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel ... Original commit: elastic/x-pack-elasticsearch@62796c796a	2015-09-04 16:08:06 -07:00
Khalah Jones Golden	9a6d8a0bdd	Merge pull request elastic/elasticsearch#505 from simianhacker/gulp-eslint ... Adding ES Lint to Commit Hooks Original commit: elastic/x-pack-elasticsearch@4984d7e059	2015-09-04 17:44:41 -04:00
Khalah Jones Golden	7eeac11b48	Merge pull request elastic/elasticsearch#504 from simianhacker/bulk-indexer ... Changed Mock Indexer to use Bulk API Original commit: elastic/x-pack-elasticsearch@f40d14209d	2015-09-04 17:42:52 -04:00
Chris Cowan	585e6ee6f1	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into gulp-eslint ... Original commit: elastic/x-pack-elasticsearch@3d23f49228	2015-09-04 13:08:04 -07:00
Chris Cowan	7b0dd039bb	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into bulk-indexer ... Original commit: elastic/x-pack-elasticsearch@e2ec230a05	2015-09-04 13:07:25 -07:00
Khalah Jones Golden	d75823d8f0	Merge pull request elastic/elasticsearch#503 from simianhacker/prefix-change ... Update .marvel indices naming Original commit: elastic/x-pack-elasticsearch@0868a8457a	2015-09-04 12:54:45 -04:00
Khalah Jones Golden	3ec3fd2a89	Merge pull request elastic/elasticsearch#500 from simianhacker/shard_docs ... Moving shards to marvel_shards documents Original commit: elastic/x-pack-elasticsearch@5f9ec2060c	2015-09-04 12:53:57 -04:00
Chris Cowan	c5f7ff429b	Moving shards to marvel_shards documents ... - Closes elastic/elasticsearch#498 - Remove redundant column on shard visualization - Fix colspan on index view with unassigned shards - Add /marvel/api/v1/clusters/{cluster_uuid}/state/{state_uuid}/shards - Change shard vis to use id and type to request data from new shards api - Change indexer to use new shard schema Original commit: elastic/x-pack-elasticsearch@416e1c7fd4	2015-09-03 14:19:02 -07:00
Chris Cowan	6735fb36aa	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel ... Original commit: elastic/x-pack-elasticsearch@acf5e73ee1	2015-09-01 13:33:45 -07:00
Chris Cowan	05ee885e37	Merge pull request elastic/elasticsearch#479 from panda01/master ... Latest stable Original commit: elastic/x-pack-elasticsearch@e22c11598f	2015-09-01 13:33:31 -07:00
Chris Cowan	e95956bf22	Adding shards and setting defaults for time ... Original commit: elastic/x-pack-elasticsearch@a7b9241b35	2015-09-01 09:44:17 -07:00
Khalah Jones-Golden	e480aa778e	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@b547d23236	2015-08-31 12:38:42 -04:00
Chris Cowan	2b7c366939	Adding faker ... Original commit: elastic/x-pack-elasticsearch@b800772adf	2015-08-28 14:39:50 -07:00
Chris Cowan	71151ff4f6	Merge pull request elastic/elasticsearch#476 from panda01/master ... Node page Original commit: elastic/x-pack-elasticsearch@5d7cf05c67	2015-08-27 10:34:37 -07:00
Khalah Jones-Golden	20d80087d8	Merge remote-tracking branch 'upstream/master' ... Original commit: elastic/x-pack-elasticsearch@4707b33364	2015-08-27 13:34:21 -04:00
Chris Cowan	4599e885e8	Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel ... Original commit: elastic/x-pack-elasticsearch@53ccc3b7ce	2015-08-26 15:26:29 -07:00
Chris Cowan	d4836ed7a1	Adding phone home details ... Original commit: elastic/x-pack-elasticsearch@23a305c196	2015-08-26 15:25:28 -07:00
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