[ambari-logsearch] branch master updated: Fix Log Feeder docker dev env

[oleewere]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git


The following commit(s) were added to refs/heads/master by this push:
     new ea1e4e8  Fix Log Feeder docker dev env
ea1e4e8 is described below

commit ea1e4e8735cf085b6a1630b1b6a2a6b90c05e348
Author: Oliver Szabo <oleew...@gmail.com>
AuthorDate: Wed Nov 21 15:23:42 2018 +0100

    Fix Log Feeder docker dev env
---
 docker/test-config/logfeeder/logfeeder.properties  |  2 +-
 .../logfeeder/shipper-conf/output.config.json      | 38 ----------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/docker/test-config/logfeeder/logfeeder.properties 
b/docker/test-config/logfeeder/logfeeder.properties
index aed8337..1ef8c42 100644
--- a/docker/test-config/logfeeder/logfeeder.properties
+++ b/docker/test-config/logfeeder/logfeeder.properties
@@ -38,7 +38,7 @@ logfeeder.solr.core.config.name=history
 logfeeder.cloud.storage.mode=default
 logfeeder.cloud.storage.destination=s3
 logfeeder.cloud.rollover.threshold.min=1000
-logfeeder.cloud.rollover.threshold.size=1K
+logfeeder.cloud.rollover.threshold.size=1
 
 logfeeder.s3.endpoint=http://fakes3:4569
 logfeeder.s3.secret.key=MySecretKey
diff --git a/docker/test-config/logfeeder/shipper-conf/output.config.json 
b/docker/test-config/logfeeder/shipper-conf/output.config.json
index 62950d1..a85b4a4 100644
--- a/docker/test-config/logfeeder/shipper-conf/output.config.json
+++ b/docker/test-config/logfeeder/shipper-conf/output.config.json
@@ -31,44 +31,6 @@
           ]
         }
       }
-    },
-    {
-      "comment": "S3 file output",
-      "is_enabled": "true",
-      "destination": "s3_file",
-      "type": "s3",
-      "s3_access_key" : "accessKey",
-      "s3_secret_key" : "secretKey",
-      "s3_bucket" : "docker-logsearch",
-      "s3_endpoint" : "http://fakes3:4569";,
-      "s3_log_dir" : "/tmp",
-      "skip_logtime": "true",
-      "conditions": {
-        "fields": {
-          "rowtype": [
-            "s3"
-          ]
-        }
-      }
-    },
-    {
-      "comment": "HDFS file output",
-      "is_enabled": "true",
-      "destination": "hdfs",
-      "type": "hdfs",
-      "file_name_prefix":"service-logs-",
-      "hdfs_out_dir": "/logfeeder/$HOST/service",
-      "hdfs_host": "namenode",
-      "hdfs_port": "9000",
-      "rollover_sec":"10",
-      "skip_logtime": "true",
-      "conditions": {
-        "fields": {
-          "rowtype": [
-            "hdfs"
-          ]
-        }
-      }
     }
   ]
 }