METRON-1541 Mvn clean results in git status having deleted files. (justinleet via nickwallen) closes apache/metron#1003
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/a17c1adf Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/a17c1adf Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/a17c1adf Branch: refs/heads/feature/METRON-1090-stellar-assignment Commit: a17c1adfd4cca63a49ef542c21cef90b18c74be0 Parents: d7edce9 Author: justinleet <justinjl...@gmail.com> Authored: Wed May 9 16:47:29 2018 -0400 Committer: nickallen <nickal...@apache.org> Committed: Wed May 9 16:47:29 2018 -0400 ---------------------------------------------------------------------- metron-deployment/packaging/ambari/.gitignore | 2 + .../enrichment-splitjoin.properties.j2 | 63 -------------------- .../templates/enrichment-unified.properties.j2 | 60 ------------------- 3 files changed, 2 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/a17c1adf/metron-deployment/packaging/ambari/.gitignore ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/.gitignore b/metron-deployment/packaging/ambari/.gitignore index ca2e75c..2f93166 100644 --- a/metron-deployment/packaging/ambari/.gitignore +++ b/metron-deployment/packaging/ambari/.gitignore @@ -3,3 +3,5 @@ archive.zip elasticsearch.properties.j2 hdfs.properties.j2 enrichment.properties.j2 +enrichment-splitjoin.properties.j2 +enrichment-unified.properties.j2 http://git-wip-us.apache.org/repos/asf/metron/blob/a17c1adf/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-splitjoin.properties.j2 ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-splitjoin.properties.j2 b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-splitjoin.properties.j2 deleted file mode 100644 index a0b21c9..0000000 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-splitjoin.properties.j2 +++ /dev/null @@ -1,63 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#} - -##### Storm ##### -enrichment.workers={{enrichment_workers}} -enrichment.acker.executors={{enrichment_acker_executors}} -topology.worker.childopts={{enrichment_topology_worker_childopts}} -topology.auto-credentials={{topology_auto_credentials}} -topology.max.spout.pending={{enrichment_topology_max_spout_pending}} - -##### Kafka ##### -kafka.zk={{zookeeper_quorum}} -kafka.broker={{kafka_brokers}} -kafka.security.protocol={{kafka_security_protocol}} - -# One of EARLIEST, LATEST, UNCOMMITTED_EARLIEST, UNCOMMITTED_LATEST -kafka.start={{enrichment_kafka_start}} - -enrichment.input.topic={{enrichment_input_topic}} -enrichment.output.topic={{enrichment_output_topic}} -enrichment.error.topic={{enrichment_error_topic}} -threat.intel.error.topic={{threatintel_error_topic}} - -##### JoinBolt ##### -enrichment.join.cache.size={{enrichment_join_cache_size}} -threat.intel.join.cache.size={{threatintel_join_cache_size}} - -##### Enrichment ##### -hbase.provider.impl={{enrichment_hbase_provider_impl}} -enrichment.simple.hbase.table={{enrichment_hbase_table}} -enrichment.simple.hbase.cf={{enrichment_hbase_cf}} -enrichment.host.known_hosts={{enrichment_host_known_hosts}} - -##### Threat Intel ##### -threat.intel.tracker.table={{threatintel_hbase_table}} -threat.intel.tracker.cf={{threatintel_hbase_cf}} -threat.intel.simple.hbase.table={{threatintel_hbase_table}} -threat.intel.simple.hbase.cf={{threatintel_hbase_cf}} - -##### Parallelism ##### -kafka.spout.parallelism={{enrichment_kafka_spout_parallelism}} -enrichment.split.parallelism={{enrichment_split_parallelism}} -enrichment.stellar.parallelism={{enrichment_stellar_parallelism}} -enrichment.join.parallelism={{enrichment_join_parallelism}} -threat.intel.split.parallelism={{threat_intel_split_parallelism}} -threat.intel.stellar.parallelism={{threat_intel_stellar_parallelism}} -threat.intel.join.parallelism={{threat_intel_join_parallelism}} -kafka.writer.parallelism={{kafka_writer_parallelism}} http://git-wip-us.apache.org/repos/asf/metron/blob/a17c1adf/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-unified.properties.j2 ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-unified.properties.j2 b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-unified.properties.j2 deleted file mode 100644 index 8c28c49..0000000 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/enrichment-unified.properties.j2 +++ /dev/null @@ -1,60 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#} - -##### Storm ##### -enrichment.workers={{enrichment_workers}} -enrichment.acker.executors={{enrichment_acker_executors}} -topology.worker.childopts={{enrichment_topology_worker_childopts}} -topology.auto-credentials={{topology_auto_credentials}} -topology.max.spout.pending={{enrichment_topology_max_spout_pending}} - -##### Kafka ##### -kafka.zk={{zookeeper_quorum}} -kafka.broker={{kafka_brokers}} -kafka.security.protocol={{kafka_security_protocol}} -kafka.start={{enrichment_kafka_start}} -enrichment.input.topic={{enrichment_input_topic}} -enrichment.output.topic={{enrichment_output_topic}} -enrichment.error.topic={{enrichment_error_topic}} -threat.intel.error.topic={{threatintel_error_topic}} - -##### Enrichment ##### -hbase.provider.impl={{enrichment_hbase_provider_impl}} -enrichment.simple.hbase.table={{enrichment_hbase_table}} -enrichment.simple.hbase.cf={{enrichment_hbase_cf}} -enrichment.host.known_hosts={{enrichment_host_known_hosts}} - -##### Threat Intel ##### -threat.intel.tracker.table={{threatintel_hbase_table}} -threat.intel.tracker.cf={{threatintel_hbase_cf}} -threat.intel.simple.hbase.table={{threatintel_hbase_table}} -threat.intel.simple.hbase.cf={{threatintel_hbase_cf}} - -##### Parallelism ##### -kafka.spout.parallelism={{unified_kafka_spout_parallelism}} -enrichment.parallelism={{unified_enrichment_parallelism}} -threat.intel.parallelism={{unified_threat_intel_parallelism}} -kafka.writer.parallelism={{unified_kafka_writer_parallelism}} - -##### Caches ##### -enrichment.cache.size={{unified_enrichment_cache_size}} -threat.intel.cache.size={{unified_threat_intel_cache_size}} - -##### Threads ##### -enrichment.threadpool.size={{unified_enrichment_threadpool_size}} -enrichment.threadpool.type={{unified_enrichment_threadpool_type}}