You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2010/07/27 00:00:07 UTC
svn commit: r979464 - in /hadoop/zookeeper/trunk: ./ src/contrib/monitoring/
src/contrib/monitoring/cacti/ src/contrib/monitoring/ganglia/
src/contrib/monitoring/nagios/
Author: mahadev
Date: Mon Jul 26 22:00:07 2010
New Revision: 979464
URL: http://svn.apache.org/viewvc?rev=979464&view=rev
Log:
ZOOKEEPER-814. monitoring scripts are missing apache license headers (andrei savu via mahadev)
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/src/contrib/monitoring/README
hadoop/zookeeper/trunk/src/contrib/monitoring/cacti/README
hadoop/zookeeper/trunk/src/contrib/monitoring/check_zookeeper.py
hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/README
hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/modpython.conf
hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper.pyconf
hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper_ganglia.py
hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/README.txt
hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/hostgroups.cfg
hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/services.cfg
hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/zookeeper.cfg
hadoop/zookeeper/trunk/src/contrib/monitoring/test.py
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Mon Jul 26 22:00:07 2010
@@ -66,6 +66,9 @@ BUGFIXES:
ZOOKEEPER-719. Add throttling to BookKeeper client (fpj via breed)
+ ZOOKEEPER-814. monitoring scripts are missing apache license headers
+ (andrei savu via mahadev)
+
IMPROVEMENTS:
ZOOKEEPER-724. Improve junit test integration - log harness information
(phunt via mahadev)
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/README
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/README?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/README (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/README Mon Jul 26 22:00:07 2010
@@ -72,6 +72,11 @@ it will use gmetric to send zookeeper no
Check the subfolders for configuration details and samples for each platform.
+License
+-------
+
+Apache License 2.0 or later.
+
ZooKeeper 4letterwords Commands
-------------------------------
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/cacti/README
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/cacti/README?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/cacti/README (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/cacti/README Mon Jul 26 22:00:07 2010
@@ -1,3 +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.
Recipes for ZooKeeper monitoring using Cacti
--------------------------------------------
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/check_zookeeper.py
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/check_zookeeper.py?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/check_zookeeper.py (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/check_zookeeper.py Mon Jul 26 22:00:07 2010
@@ -1,4 +1,19 @@
#! /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.
""" Check Zookeeper Cluster
Generic monitoring script that could be used with multiple platforms (Ganglia, Nagios, Cacti).
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/README
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/README?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/README (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/README Mon Jul 26 22:00:07 2010
@@ -1,3 +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.
Recipes for ZooKeeper monitoring using Ganglia
----------------------------------------------
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/modpython.conf
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/modpython.conf?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/modpython.conf (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/modpython.conf Mon Jul 26 22:00:07 2010
@@ -1,3 +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. */
/* Update gmond.conf */
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper.pyconf
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper.pyconf?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper.pyconf (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper.pyconf Mon Jul 26 22:00:07 2010
@@ -1,3 +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. */
/* Update /etc/ganglia/gmond.conf with the content of this file. */
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper_ganglia.py
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper_ganglia.py?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper_ganglia.py (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/ganglia/zookeeper_ganglia.py Mon Jul 26 22:00:07 2010
@@ -1,3 +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.
""" Python Ganglia Module for ZooKeeper monitoring
Inspired by: http://gist.github.com/448007
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/README.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/README.txt?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/README.txt (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/README.txt Mon Jul 26 22:00:07 2010
@@ -1,3 +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.
Configuration Recipe for monitoring ZooKeeper using Nagios
----------------------------------------------------------
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/hostgroups.cfg
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/hostgroups.cfg?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/hostgroups.cfg (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/hostgroups.cfg Mon Jul 26 22:00:07 2010
@@ -1,3 +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.
# A group containing all the ZooKeeper nodes
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/services.cfg
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/services.cfg?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/services.cfg (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/services.cfg Mon Jul 26 22:00:07 2010
@@ -1,3 +1,19 @@
+# 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.
+
# ZooKeeper Node specific services
define service {
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/zookeeper.cfg
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/zookeeper.cfg?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/zookeeper.cfg (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/nagios/zookeeper.cfg Mon Jul 26 22:00:07 2010
@@ -1,3 +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.
# 'check_zookeeper' command definition
define command {
Modified: hadoop/zookeeper/trunk/src/contrib/monitoring/test.py
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/monitoring/test.py?rev=979464&r1=979463&r2=979464&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/monitoring/test.py (original)
+++ hadoop/zookeeper/trunk/src/contrib/monitoring/test.py Mon Jul 26 22:00:07 2010
@@ -1,4 +1,19 @@
#! /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.
import unittest
import socket