Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Adding support for collecting data from multiple memcached in…

…stances"

This reverts commit 95020ef.
Support for this feature is not enabled in collectd 5.1.0
  • Loading branch information...
commit dfd9b7871de0f27184f162b4068352f55d4bdc4a 1 parent 95020ef
@viralshah viralshah authored
View
2  metadata.rb
@@ -4,6 +4,6 @@
license "Apache 2.0"
description "Install and configure the collectd monitoring daemon and plugins"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.1.4"
+version "1.1.3"
supports "ubuntu"
depends "build-essential"
View
2  providers/plugin.rb
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-CUSTOM_TEMPLATES = [ "write_graphite", "mysql", "memcached" ]
+CUSTOM_TEMPLATES = [ "write_graphite", "mysql" ]
def template_map(type)
plugin_prefix = CUSTOM_TEMPLATES.include?(type.to_s) ? "#{type}_" : ""
View
23 templates/default/memcached_plugin.conf.erb
@@ -1,23 +0,0 @@
-#
-# This file is generated by Chef
-# Do not edit, changes will be overwritten
-#
-LoadPlugin "<%= @type %>"
-
-<% if not @config.empty? %>
-<Plugin "<%= @type %>">
-<% @config.sort{|a,b| a[0].to_s <=> b[0].to_s}.map do |instance_name, instance_info| %>
- <%= "<Instance \"#{instance_name}\">" %>
- <% if not instance_info.empty? %>
- <% instance_info.sort{|a,b| a[0].to_s <=> b[0].to_s}.map do |key, value|
- if value.is_a? Array
- value.each do |subvalue| %>
- <%= key %> <%= collectd_option(subvalue) %>
- <% end else %>
- <%= key %> <%= collectd_option(value) %>
- <% end end %>
- <% end %>
- <%= "</Instance>" %>
-<% end %>
-</Plugin>
-<% end %>
Please sign in to comment.
Something went wrong with that request. Please try again.