[metron] branch feature/METRON-2088-support-hdp-3.1 updated (69163fa -> 92034de)
This is an automated email from the ASF dual-hosted git repository. mmiklavcic pushed a change to branch feature/METRON-2088-support-hdp-3.1 in repository https://gitbox.apache.org/repos/asf/metron.git. from 69163fa Merge remote-tracking branch 'upstream/master' into feature/METRON-2088-support-hdp-3.1 add fca9ebf METRON-2239 Metron Automated backup and restore (mmiklavc) closes apache/metron#1546 new 92034de Merge branch 'master' into feature/METRON-2088-support-hdp-3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Upgrade_steps.md | 40 +++ .../packaging/docker/rpm-docker/SPECS/metron.spec | 1 + metron-platform/metron-common/README.md| 30 ++ .../src/main/scripts/upgrade_helper.sh | 120 + 4 files changed, 191 insertions(+) create mode 100644 Upgrade_steps.md create mode 100755 metron-platform/metron-common/src/main/scripts/upgrade_helper.sh
[metron] 01/01: Merge branch 'master' into feature/METRON-2088-support-hdp-3.1
This is an automated email from the ASF dual-hosted git repository. mmiklavcic pushed a commit to branch feature/METRON-2088-support-hdp-3.1 in repository https://gitbox.apache.org/repos/asf/metron.git commit 92034de2f6fc5657c43a996ac4784fbe4717a010 Merge: 69163fa fca9ebf Author: Michael Miklavcic AuthorDate: Wed Nov 13 11:37:03 2019 -0700 Merge branch 'master' into feature/METRON-2088-support-hdp-3.1 Upgrade_steps.md | 40 +++ .../packaging/docker/rpm-docker/SPECS/metron.spec | 1 + metron-platform/metron-common/README.md| 30 ++ .../src/main/scripts/upgrade_helper.sh | 120 + 4 files changed, 191 insertions(+)
[metron] 01/01: Merge remote-tracking branch 'upstream/master' into feature/METRON-2088-support-hdp-3.1
This is an automated email from the ASF dual-hosted git repository. nickallen pushed a commit to branch feature/METRON-2088-support-hdp-3.1 in repository https://gitbox.apache.org/repos/asf/metron.git commit 69163fab7cf5a14754c96e7115492f0ce9e1ebca Merge: 78a6f38 12e16df Author: nickallen AuthorDate: Wed Nov 13 12:22:35 2019 -0500 Merge remote-tracking branch 'upstream/master' into feature/METRON-2088-support-hdp-3.1 metron-analytics/metron-maas-service/README.md | 209 - metron-analytics/metron-profiler-common/README.md | 10 +- .../metron/profiler/spark/BatchProfiler.java | 4 +- .../spark/BatchProfilerIntegrationTest.java| 29 ++- .../alerts/alerts-list/alerts-list.component.ts| 1 + .../auto-polling/auto-polling.service.spec.ts | 12 +- .../auto-polling/auto-polling.service.ts | 9 +- .../metron-elasticsearch-storm/pom.xml | 11 ++ .../metron-indexing/metron-indexing-storm/pom.xml | 23 +-- .../metron-solr/metron-solr-storm/pom.xml | 6 + 10 files changed, 269 insertions(+), 45 deletions(-)
[metron] branch feature/METRON-2088-support-hdp-3.1 updated: METRON-2223 Reconcile Versions in Root POM with HDP 3.1 (nickwallen) closes apache/metron#1551
This is an automated email from the ASF dual-hosted git repository. nickallen pushed a commit to branch feature/METRON-2088-support-hdp-3.1 in repository https://gitbox.apache.org/repos/asf/metron.git The following commit(s) were added to refs/heads/feature/METRON-2088-support-hdp-3.1 by this push: new 78a6f38 METRON-2223 Reconcile Versions in Root POM with HDP 3.1 (nickwallen) closes apache/metron#1551 78a6f38 is described below commit 78a6f38daa1ff4602e32d1c11a2d5d726d9975e4 Author: nickwallen AuthorDate: Wed Nov 13 12:19:35 2019 -0500 METRON-2223 Reconcile Versions in Root POM with HDP 3.1 (nickwallen) closes apache/metron#1551 --- README.md | 2 +- .../ambari_config/tasks/dependencies-CentOS-6.yml | 26 .../ambari_slave/tasks/install-agent-CentOS-6.yml | 19 --- .../tasks/install-service-CentOS-6.yml | 22 .../manual-install/Manual_Install_CentOS6.md | 18 +-- metron-platform/metron-storm-kafka/pom.xml | 2 +- pom.xml| 137 + 7 files changed, 68 insertions(+), 158 deletions(-) diff --git a/README.md b/README.md index a3bc14e..f7977a5 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ $ mvn clean install -DskipTests Build with the HDP profile: ``` -$ mvn clean install -PHDP-2.5.0.0 +$ mvn clean install -PHDP-3.1 ``` You can swap "install" for "package" in the commands above if you don't want to deploy the artifacts to your local .m2 repo. diff --git a/metron-deployment/ansible/roles/ambari_config/tasks/dependencies-CentOS-6.yml b/metron-deployment/ansible/roles/ambari_config/tasks/dependencies-CentOS-6.yml deleted file mode 100644 index 72a96d4..000 --- a/metron-deployment/ansible/roles/ambari_config/tasks/dependencies-CentOS-6.yml +++ /dev/null @@ -1,26 +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. -# -- name: Install urllib3 with pip - pip: -name: urllib3 -version: 1.10.2 - -- name: Install requests with pip - pip: -name: requests -version: 2.6.1 diff --git a/metron-deployment/ansible/roles/ambari_slave/tasks/install-agent-CentOS-6.yml b/metron-deployment/ansible/roles/ambari_slave/tasks/install-agent-CentOS-6.yml deleted file mode 100644 index 8f16b92..000 --- a/metron-deployment/ansible/roles/ambari_slave/tasks/install-agent-CentOS-6.yml +++ /dev/null @@ -1,19 +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. -# -- name: Install ambari-agent on CentOS 6 - yum: name=ambari-agent diff --git a/metron-deployment/ansible/roles/sensor-stubs/tasks/install-service-CentOS-6.yml b/metron-deployment/ansible/roles/sensor-stubs/tasks/install-service-CentOS-6.yml deleted file mode 100644 index 022e49f..000 --- a/metron-deployment/ansible/roles/sensor-stubs/tasks/install-service-CentOS-6.yml +++ /dev/null @@ -1,22 +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 -#
[metron] branch master updated: METRON-2308 Fix 'Degrees' Example Profile (nickwallen) closes apache/metron#1555
This is an automated email from the ASF dual-hosted git repository.
nickallen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push:
new 12e16df METRON-2308 Fix 'Degrees' Example Profile (nickwallen) closes
apache/metron#1555
12e16df is described below
commit 12e16df4c340be169ff0d0190c732948fdcd2e44
Author: nickwallen
AuthorDate: Wed Nov 13 10:06:30 2019 -0500
METRON-2308 Fix 'Degrees' Example Profile (nickwallen) closes
apache/metron#1555
---
metron-analytics/metron-profiler-common/README.md | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/metron-analytics/metron-profiler-common/README.md
b/metron-analytics/metron-profiler-common/README.md
index fe4c2ed..5841efc 100644
--- a/metron-analytics/metron-profiler-common/README.md
+++ b/metron-analytics/metron-profiler-common/README.md
@@ -363,15 +363,17 @@ This profile captures the vertex degree of a host. If you
view network communica
"profile": "in-degrees",
"onlyif": "source.type == 'yaf'",
"foreach": "ip_dst_addr",
- "update": { "in": "HLLP_ADD(in, ip_src_addr)" },
- "result": "HLLP_CARDINALITY(in)"
+ "init": { "estimator": "HLLP_INIT()" },
+ "update": { "estimator": "HLLP_ADD(estimator, ip_src_addr)" },
+ "result": "HLLP_CARDINALITY(estimator)"
},
{
"profile": "out-degrees",
"onlyif": "source.type == 'yaf'",
"foreach": "ip_src_addr",
- "update": { "out": "HLLP_ADD(out, ip_dst_addr)" },
- "result": "HLLP_CARDINALITY(out)"
+ "init": { "estimator": "HLLP_INIT()" },
+ "update": { "estimator": "HLLP_ADD(estimator, ip_dst_addr)" },
+ "result": "HLLP_CARDINALITY(estimator)"
}
]
}
