moved to elasticsearch-enterprise - part 2

Original commit: elastic/x-pack-elasticsearch@e7a7b2fa60

pom.xml

@@ -25,7 +25,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>0.90.5</elasticsearch.version>
+        <elasticsearch.version>0.90.6-SNAPSHOT</elasticsearch.version>
     </properties>
 
     <repositories>

src/main/java/org/elasticsearch/enterprise/monitor/Plugin.java

@@ -3,9 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package com.elasticsearch.dash;
+package org.elasticsearch.enterprise.monitor;
 
-import com.google.common.collect.ImmutableList;
+import org.elasticsearch.common.collect.ImmutableList;
 import org.elasticsearch.common.component.LifecycleComponent;
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.inject.Module;

src/main/java/org/elasticsearch/enterprise/monitor/StatsExportersService.java

@@ -3,9 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package com.elasticsearch.dash;/*
+package org.elasticsearch.enterprise.monitor;
-import com.elasticsearch.dash.exporters.ESExporter;
+import org.elasticsearch.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet;
+import org.elasticsearch.enterprise.monitor.exporter.ESExporter;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
@@ -16,6 +16,7 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.enterprise.monitor.exporter.StatsExporter;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.InternalIndicesService;
 import org.elasticsearch.node.service.NodeService;
@@ -91,18 +92,18 @@ public class StatsExportersService extends AbstractLifecycleComponent<StatsExpor
                         }
                     }
 
-                    logger.debug("Collecting shard stats");
+//                    logger.warn("Collecting shard stats");
-                    List<ShardStats> shardStatsList = indicesService.shardLevelStats(CommonStatsFlags.ALL);
+//                    List<ShardStats> shardStatsList = indicesService.shardLevelStats(CommonStatsFlags.ALL);
-
+//
-                    logger.debug("Exporting shards stats");
+//                    logger.debug("Exporting shards stats");
-                    for (StatsExporter e : exporters) {
+//                    for (StatsExporter e : exporters) {
-                        try {
+//                        try {
-                            for (ShardStats shardStats : shardStatsList)
+//                            for (ShardStats shardStats : shardStatsList)
-                                e.exportShardStats(shardStats);
+//                                e.exportShardStats(shardStats);
-                        } catch (Throwable t) {
+//                        } catch (Throwable t) {
-                            logger.error("StatsExporter {} has thrown an exception:", t, e.name());
+//                            logger.error("StatsExporter {} has thrown an exception:", t, e.name());
-                        }
+//                        }
-                    }
+//                    }
                 } catch (Throwable t) {
                     logger.error("Background thread had an uncaught exception:", t);
                 }

src/main/java/org/elasticsearch/enterprise/monitor/exporter/ESExporter.java

@@ -3,9 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package com.elasticsearch.dash.exporters;
+package org.elasticsearch.enterprise.monitor.exporter;
-import com.elasticsearch.dash.StatsExporter;
+import org.elasticsearch.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
@@ -50,19 +49,18 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
         // TODO: move to a single settings.
         targetHost = settings.get("target.host", "localhost");
         targetPort = settings.getAsInt("target.post", 9200);
-        String targetIndexPrefix = settings.get("target.index.prefix", "dash");
+        String targetIndexPrefix = settings.get("target.index.prefix", "");
 
         try {
-            targetPathPrefix = String.format("/%s_%s_",
+            if (!targetIndexPrefix.isEmpty()) targetIndexPrefix += targetIndexPrefix + "_";
-                    URLEncoder.encode(targetIndexPrefix,"UTF-8"),
+            targetPathPrefix = "/"+ URLEncoder.encode(targetIndexPrefix,"UTF-8") + URLEncoder.encode(clusterName.value(),"UTF-8");
-                    URLEncoder.encode(clusterName.value(),"UTF-8"));
 
         } catch (UnsupportedEncodingException e) {
             throw new ElasticSearchException("Can't encode target url", e);
         }
 
 
-        xContentParams = new ToXContent.MapParams(ImmutableMap.of("human_readable","false"));
+        xContentParams = new ToXContent.MapParams(ImmutableMap.of("human_readable", "false"));
 
 
         logger.info("ESExporter initialized. Target: {}:{} Index prefix set to {}", targetHost, targetPort, targetIndexPrefix );
@@ -93,7 +91,7 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
 
     @Override
     public void exportShardStats(ShardStats shardStats) {
-        exportXContent("shardstats", shardStats);
+        //exportXContent("shardstats", shardStats);
     }
 
     private void exportXContent(String type,ToXContent xContent) {

src/main/java/org/elasticsearch/enterprise/monitor/exporter/StatsExporter.java

@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package com.elasticsearch.dash;
+package org.elasticsearch.enterprise.monitor.exporter;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
 import org.elasticsearch.action.admin.indices.stats.ShardStats;
-import org.elasticsearch.common.component.CloseableComponent;
 import org.elasticsearch.common.component.LifecycleComponent;
 
 public interface StatsExporter<T> extends LifecycleComponent<T> {

src/main/resources/es-plugin.properties

@@ -1 +1 @@
-plugin=com.elasticsearch.dash.Plugin
+plugin=org.elasticsearch.enterprise.monitor.Plugin