You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2016/01/13 15:01:32 UTC
incubator-eagle git commit: EAGLE-125 Fix AL in
eagle-external/hadoop_jmx_collector
Repository: incubator-eagle
Updated Branches:
refs/heads/master 90a1fb3f8 -> 48870eafe
EAGLE-125 Fix AL in eagle-external/hadoop_jmx_collector
https://issues.apache.org/jira/browse/EAGLE-125
Author: @qinzhaokun <qi...@gmail.com>
Reviewer: @haoch <ha...@apache.org>
Closes #63
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/48870eaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/48870eaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/48870eaf
Branch: refs/heads/master
Commit: 48870eafe49dc4088d73303cf111c6636c7abe83
Parents: 90a1fb3
Author: Hao Chen <ha...@apache.org>
Authored: Wed Jan 13 21:59:56 2016 +0800
Committer: Hao Chen <ha...@apache.org>
Committed: Wed Jan 13 21:59:56 2016 +0800
----------------------------------------------------------------------
.../hadoop_jmx_collector/eagle-collector.conf | 14 +++++++++++++
.../hadoop_jmx_collector/hadoop_jmx_kafka.py | 5 ++---
.../lib/kafka-python/.gitignore | 19 ++++++++++++++++++
.../lib/kafka-python/.gitmodules | 18 +++++++++++++++++
.../lib/kafka-python/AUTHORS.md | 19 ++++++++++++++++++
.../lib/kafka-python/CHANGES.md | 19 ++++++++++++++++++
.../lib/kafka-python/POWERED-BY.md | 19 ++++++++++++++++++
.../lib/kafka-python/build_integration.sh | 19 ++++++++++++++++++
.../lib/kafka-python/docs/conf.py | 19 ++++++++++++++++++
.../lib/kafka-python/example.py | 21 ++++++++++++++++++++
.../hadoop_jmx_collector/system_metric_kafka.py | 15 ++++++++++++++
pom.xml | 2 ++
12 files changed, 186 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/eagle-collector.conf
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/eagle-collector.conf b/eagle-external/hadoop_jmx_collector/eagle-collector.conf
index 08ed74d..24fac51 100644
--- a/eagle-external/hadoop_jmx_collector/eagle-collector.conf
+++ b/eagle-external/hadoop_jmx_collector/eagle-collector.conf
@@ -1,3 +1,17 @@
+# 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.
{
"env": {
"site": "sandbox"
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/hadoop_jmx_kafka.py
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/hadoop_jmx_kafka.py b/eagle-external/hadoop_jmx_collector/hadoop_jmx_kafka.py
index 8ebeb9f..95569e5 100644
--- a/eagle-external/hadoop_jmx_collector/hadoop_jmx_kafka.py
+++ b/eagle-external/hadoop_jmx_collector/hadoop_jmx_kafka.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
# 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.
@@ -13,9 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-#!/usr/bin/python
-
import os
import re
import time
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitignore
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitignore b/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitignore
index 30d663d..260dbea 100644
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitignore
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitignore
@@ -1,3 +1,22 @@
+# 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.
+
+# Eagle - Git Ignore Configuration
+#
+# See: https://github.com/github/gitignore/
+
*.egg-info
*.pyc
.tox
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitmodules
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitmodules b/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitmodules
index e69de29..fe0f4fb 100644
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitmodules
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/.gitmodules
@@ -0,0 +1,18 @@
+# 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.
+
+# Eagle - Git Ignore Configuration
+#
+# See: https://github.com/github/gitignore/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/AUTHORS.md
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/AUTHORS.md b/eagle-external/hadoop_jmx_collector/lib/kafka-python/AUTHORS.md
index 67e3789..30ee904 100644
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/AUTHORS.md
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/AUTHORS.md
@@ -1,3 +1,22 @@
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
# Contributors
Top 10 contributors, listed by contribution. See https://github.com/mumrah/kafka-python/graphs/contributors for the full list
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/CHANGES.md
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/CHANGES.md b/eagle-external/hadoop_jmx_collector/lib/kafka-python/CHANGES.md
index 5704afa..cf6d09f 100644
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/CHANGES.md
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/CHANGES.md
@@ -1,3 +1,22 @@
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
# 0.9.3 (Feb 3, 2015)
* Add coveralls.io support (sontek PR 307)
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/POWERED-BY.md
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/POWERED-BY.md b/eagle-external/hadoop_jmx_collector/lib/kafka-python/POWERED-BY.md
index f2e323c..acf0a66 100644
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/POWERED-BY.md
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/POWERED-BY.md
@@ -1,3 +1,22 @@
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
# Project/People/Companies using kafka-python
If you're using this library and care to give us a shout out, please fork the project,
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/build_integration.sh
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/build_integration.sh b/eagle-external/hadoop_jmx_collector/lib/kafka-python/build_integration.sh
index 2b81745..16694fa 100755
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/build_integration.sh
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/build_integration.sh
@@ -1,5 +1,24 @@
#!/bin/bash
+# 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.
+
+# Eagle - Git Ignore Configuration
+#
+# See: https://github.com/github/gitignore/
+
# Versions available for testing via binary distributions
OFFICIAL_RELEASES="0.8.0 0.8.1 0.8.1.1 0.8.2.0"
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/docs/conf.py
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/docs/conf.py b/eagle-external/hadoop_jmx_collector/lib/kafka-python/docs/conf.py
index ea223c2..31b4b5b 100644
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/docs/conf.py
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/docs/conf.py
@@ -1,3 +1,22 @@
+# 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.
+
+# Eagle - Git Ignore Configuration
+#
+# See: https://github.com/github/gitignore
+
# -*- coding: utf-8 -*-
#
# kafka-python documentation build configuration file, created by
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/lib/kafka-python/example.py
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/lib/kafka-python/example.py b/eagle-external/hadoop_jmx_collector/lib/kafka-python/example.py
index 062761b..35cf89b 100755
--- a/eagle-external/hadoop_jmx_collector/lib/kafka-python/example.py
+++ b/eagle-external/hadoop_jmx_collector/lib/kafka-python/example.py
@@ -1,4 +1,25 @@
#!/usr/bin/env python
+
+# 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.
+
+# Eagle - Git Ignore Configuration
+#
+# See: https://github.com/github/gitignore
+
+
import threading, logging, time
from kafka.client import KafkaClient
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/eagle-external/hadoop_jmx_collector/system_metric_kafka.py
----------------------------------------------------------------------
diff --git a/eagle-external/hadoop_jmx_collector/system_metric_kafka.py b/eagle-external/hadoop_jmx_collector/system_metric_kafka.py
index 9f07734..40197eb 100644
--- a/eagle-external/hadoop_jmx_collector/system_metric_kafka.py
+++ b/eagle-external/hadoop_jmx_collector/system_metric_kafka.py
@@ -1,5 +1,20 @@
#!/usr/bin/python
+# 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.
+
import os
import re
import time
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/48870eaf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d8b8158..24375a3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -900,6 +900,8 @@
<exclude>**/dev-supports/**/*.json</exclude>
<exclude>**/dev-supports/**/useractivity-agg-json.txt</exclude>
<exclude>**/conf/sandbox-userprofile-topology.conf</exclude>
+ <exclude>**/kafka-python/**</exclude>
+ <exclude>**/six/**</exclude>
<!-- Fonts and Images -->
<exclude>**/fonts/**</exclude>
<exclude>**/images/**</exclude>