Adding ingenico customization from different contributor.

manifests/config.pp

@@ -359,4 +359,19 @@
     }
   }
 
+  if $::graphite::gr_whisper_clean_retention > 0 {
+    file { "${::graphite::base_dir_REAL}/bin/whisper-cleanup.sh":
+      ensure  => file,
+      mode    => '0544',
+      content => template('graphite/opt/graphite/bin/whisper-cleanup.sh.erb'),
+    }
+
+    cron { 'Clean whisper data':
+      command => "${::graphite::base_dir_REAL}/bin/whisper-cleanup.sh",
+      hour    => $::graphite::gr_whisper_clean_hour,
+      minute  => $::graphite::gr_whisper_clean_minute,
+      require => File["${::graphite::base_dir_REAL}/bin/whisper-cleanup.sh"],
+      user    => root,
+    }
+  }
 }

manifests/init.pp

@@ -43,6 +43,24 @@
 # [*gr_carbon_relay_ulimit*]
 #   The maximum number of file descriptors available to carbon-relay process
 #   Default is undef
+# [*gr_enable_carbon_tags *]
+#   toring data using tags to identify each series.
+#   Default is false.
+# [*gr_carbon_tag_update_interval*]
+#   Tag update interval, this specifies how frequently updates to existing series will trigger.
+#   an update to the tag index, the default setting is once every 100 updates.
+#   Default: 100
+# [* gr_carbon_tag_hash_filenames*]
+#   Tag hash filenames, this specifies whether tagged metric filenames should use the hash of the metric name
+#   or a human-readable name, using hashed names avoids issues with path length when using a large number of tags
+#   Default: True
+# [* gr_carbon_tag_batch_size*]
+#   Tag batch size, this specifies the maximum number of series to be sent to graphite-web in a single batch
+#   Default: 100
+# [* gr_carbon_tag_queue_size*]
+#   Tag queue size, this specifies the maximum number of series to be queued for sending to graphite-web
+#   There are separate queues for new series and for updates to existing series
+#   Default: 10000
 # [*gr_line_receiver_interface*]
 #   Interface the line receiver listens.
 #   Default is 0.0.0.0
@@ -177,6 +195,12 @@
 # [*gr_apache_24*]
 #   Boolean to enable configuration parts for Apache 2.4 instead of 2.2
 #   Default is false/true (autodected. see params.pp)
+# [*gr_graphiteweb_mpm_limit*]
+#   Sets the maximum configured value for $gr_graphiteweb_mpm_maxrequest for the lifetime of the Apache httpd process with MPM prefork module.
+#   Default is 256.
+# [*gr_graphiteweb_mpm_maxrequest*]
+#   Sets the limit on the number of simultaneous requests that will be served with MPM prefork module.
+#   Default is 256.
 # [*gr_django_1_4_or_less*]
 #   Set to true to use old Django settings style.
 #   Default is false.
@@ -310,6 +334,9 @@
 #   Secret used as salt for things like hashes, cookies, sessions etc.
 #   Has to be the same on all nodes of a graphite cluster.
 #   Default is UNSAFE_DEFAULT (CHANGE IT!)
+# [*gr_cluster_pool_max_workers*]
+#   The maximum number of worker threads that should be created.
+#   Default is 10.
 # [*gr_cluster_servers*]
 #   Array of webbapp hosts. eg.: ['10.0.2.2:80', '10.0.2.3:80']
 #   Default is undef.
@@ -420,6 +447,15 @@
 # [*gr_whisper_fallocate_create*]
 #   Set fallocate_create for whisper
 #   Default is false
+# [*gr_whisper_clean_retention*]
+#   Set retention in seconds for whisper, data older than value will be removed (0 means never)
+#   Default is 0.
+# [*gr_whisper_clean_hour*]
+#   At which hour clean run (use * for every hour)
+#   Default is 1 (1 am).
+# [*gr_whisper_clean_minute*]
+#   At which minute clean run (use * for every minute)
+#   Default is 30.
 # [*gr_log_cache_performance*]
 #   logs timings for remote calls to carbon-cache
 #   Default is 'False' (String)
@@ -533,6 +569,17 @@
 # [*gr_apache_port_https*]
 #   DEPRECATED. Use `gr_web_server_port_https` now. Trying to set this variable will
 #   cause puppet to fail.
+# [*gr_tagdb*]
+#   Graphite stores tag information in a separate tag database (TagDB).
+#   It support redis, http and internal (the graphite-web database)
+#   Default: internal
+# [*gr_tagdb_config*]
+#   Key/Value hash with tagdb configuration. Example for redis tagdb set to
+#    {
+#      TAGDB_REDIS_HOST => 'localhost',
+#      TAGDB_REDIS_PORT => 6379,
+#      TAGDB_REDIS_DB => 0,
+#    }
 #
 # === Examples
 #
@@ -554,6 +601,11 @@
   $gr_carbon_metric_prefix                = 'carbon',
   $gr_carbon_metric_interval              = 60,
   $gr_carbon_relay_ulimit                 = undef,
+  $gr_enable_carbon_tags                  = false,
+  $gr_carbon_tag_update_interval          = 100,
+  $gr_carbon_tag_hash_filenames           = true,
+  $gr_carbon_tag_batch_size               = 100,
+  $gr_carbon_tag_queue_size               = 10000,
   $gr_line_receiver_interface             = '0.0.0.0',
   $gr_line_receiver_port                  = 2003,
   $gr_enable_udp_listener                 = 'False',
@@ -691,6 +743,7 @@
   $gr_amqp_metric_name_in_body            = 'False',
   $gr_memcache_hosts                      = undef,
   $secret_key                             = 'UNSAFE_DEFAULT',
+  $gr_cluster_pool_max_workers            = 10,
   $gr_cluster_servers                     = undef,
   $gr_carbonlink_hosts                    = undef,
   $gr_cluster_fetch_timeout               = 6,
@@ -725,6 +778,8 @@
   $gr_graphiteweb_webapp_dir              = undef,
   $gr_graphiteweb_storage_dir             = '/var/lib/graphite-web',
   $gr_graphiteweb_install_lib_dir         = undef,
+  $gr_graphiteweb_mpm_limit               = 256,
+  $gr_graphiteweb_mpm_maxrequest          = 256,
   $gr_apache_logdir                       = $::graphite::params::apache_logdir_graphite,
   $gunicorn_arg_timeout                   = 30,
   $gunicorn_bind                          = 'unix:/var/run/graphite.sock',
@@ -735,6 +790,9 @@
   $gr_whisper_autoflush                   = 'False',
   $gr_whisper_lock_writes                 = 'False',
   $gr_whisper_fallocate_create            = 'False',
+  $gr_whisper_clean_retention             = 2592000,
+  $gr_whisper_clean_hour                  = 1,
+  $gr_whisper_clean_minute                = 30,
   $gr_log_cache_performance               = 'False',
   $gr_log_rendering_performance           = 'False',
   $gr_log_metric_access                   = 'False',
@@ -778,7 +836,9 @@
   $gr_rendering_hosts_timeout             = '1.0',
   $gr_prefetch_cache                      = undef,
   $gr_apache_port                         = undef,
-  $gr_apache_port_https                   = undef,) inherits graphite::params {
+  $gr_apache_port_https                   = undef,
+  $gr_tagdb                               = 'internal',
+  $gr_tagdb_config                        = {},) inherits graphite::params {
   # Validation of input variables.
   # TODO - validate all the things
   validate_string($gr_use_remote_user_auth)
@@ -790,12 +850,14 @@
   validate_bool($gr_django_1_4_or_less)
   validate_bool($gr_enable_carbon_relay)
   validate_bool($gr_enable_carbon_aggregator)
+  validate_bool($gr_enable_carbon_tags)
   validate_bool($manage_ca_certificate)
   validate_bool($gr_use_ldap)
   validate_bool($gr_pip_install)
   validate_bool($gr_manage_python_packages)
   validate_bool($gr_disable_webapp_cache)
   validate_bool($gr_base_dir_managed_externally)
+  validate_bool($gr_carbon_tag_hash_filenames)
 
   if $gr_apache_port or $gr_apache_port_https {
     fail('$gr_apache_port and $gr_apache_port_https are deprecated in favour of $gr_web_server_port and $gr_web_server_port_https')
@@ -804,6 +866,20 @@
   # validate integers
   validate_integer($gr_web_server_port)
   validate_integer($gr_web_server_port_https)
+  validate_integer($gr_cluster_pool_max_workers)
+  validate_integer($gr_graphiteweb_mpm_limit)
+  validate_integer($gr_graphiteweb_mpm_maxrequest)
+  validate_integer($gr_whisper_clean_retention)
+  validate_integer($gr_whisper_clean_hour)
+  validate_integer($gr_whisper_clean_minute)
+  validate_integer($gr_carbon_tag_update_interval)
+  validate_integer($gr_carbon_tag_batch_size)
+  validate_integer($gr_carbon_tag_queue_size)
+
+  validate_hash($gr_tagdb_config)
+  unless $gr_tagdb in ['internal', 'redis', 'http'] {
+    fail("gr_tagdb with value ${gr_tagdb} is not supported, allowed values are internal, redis or http.")
+  }
 
   $base_dir_REAL                    = $gr_base_dir
   $storage_dir_REAL                 = pick($gr_storage_dir,            "${base_dir_REAL}/storage")

templates/etc/apache2/sites-available/graphite.conf.erb

@@ -4,6 +4,11 @@
 # you will need to change all the occurances of /opt/graphite/
 # in this file to your chosen install location.
 
+<IfModule mpm_prefork_module>
+	ServerLimit       <%= scope.lookupvar('graphite::gr_graphiteweb_mpm_limit') %>
+	MaxRequestWorkers <%= scope.lookupvar('graphite::gr_graphiteweb_mpm_maxrequest') %>
+</IfModule>
+
 <IfModule !wsgi_module.c>
   <%- if @osfamily == "Debian" -%>
     LoadModule wsgi_module /usr/lib/apache2/modules/mod_wsgi.so
@@ -37,7 +42,7 @@ WSGISocketPrefix <%= scope.lookupvar('graphite::params::apache_wsgi_socket_prefi
 	WSGIScriptAlias / <%= scope.lookupvar('graphite::graphiteweb_conf_dir_REAL') %>/graphite_wsgi.py
 
 	Alias /content/ <%= scope.lookupvar('graphite::graphiteweb_webapp_dir_REAL') %>/content/
-	<Location "/content/">
+	<Location ~ "/(content|static)/">
 			SetHandler None
 <% if scope.lookupvar('graphite::gr_apache_24') %>
 			Options All

templates/opt/graphite/bin/whisper-cleanup.sh.erb

@@ -0,0 +1,20 @@
+#!/bin/bash
+# Managed by graphite puppet module
+
+main() {
+  local d=<%= scope.lookupvar('graphite::local_data_dir_REAL') %>
+  local now=$(date +%s)
+
+  local min_retention=<%= scope.lookupvar('graphite::gr_whisper_clean_retention') %>
+
+  find $d -name '*.wsp' | while read w; do
+    local age=$((now - $(stat -c '%Y' "$w")))
+    if [ $age -gt $min_retention ]; then
+      logger -t whisper-cleanup "Removing $w ($age > $retention)"
+      rm $w
+    fi
+  done
+  find $d -empty -type d -delete
+}
+
+main

templates/opt/graphite/conf/carbon.conf.erb

@@ -40,6 +40,7 @@ PID_DIR = <%= scope.lookupvar('graphite::gr_storage_dir') %>
 # Enable daily log rotation. If disabled, a kill -HUP can be used after a manual rotate
 ENABLE_LOGROTATION = True
 
+
 # Specify the user to drop privileges to
 # If this is blank carbon runs as the user that invokes it
 # This user must have write access to the local data directory
@@ -213,6 +214,24 @@ AMQP_METRIC_NAME_IN_BODY = <%= scope.lookupvar('graphite::gr_amqp_metric_name_in
 # Example: store everything
 # BIND_PATTERNS = #
 
+# Tag support, when enabled carbon will make HTTP calls to graphite-web to update the tag index
+ENABLE_TAGS = <%= scope.lookupvar('graphite::gr_enable_carbon_tags').to_s.capitalize %>
+
+# Tag update interval, this specifies how frequently updates to existing series will trigger
+# an update to the tag index, the default setting is once every 100 updates
+TAG_UPDATE_INTERVAL = <%= scope.lookupvar('graphite::gr_carbon_tag_update_interval') %>
+
+# Tag hash filenames, this specifies whether tagged metric filenames should use the hash of the metric name
+# or a human-readable name, using hashed names avoids issues with path length when using a large number of tags
+TAG_HASH_FILENAMES = <%= scope.lookupvar('graphite::gr_carbon_tag_hash_filenames').to_s.capitalize %>
+
+# Tag batch size, this specifies the maximum number of series to be sent to graphite-web in a single batch
+TAG_BATCH_SIZE = <%= scope.lookupvar('graphite::gr_carbon_tag_batch_size') %>
+
+# Tag queue size, this specifies the maximum number of series to be queued for sending to graphite-web
+# There are separate queues for new series and for updates to existing series
+TAG_QUEUE_SIZE = <%= scope.lookupvar('graphite::gr_carbon_tag_queue_size') %>
+
 # To configure special settings for the carbon-cache instance 'b', uncomment this:
 #[cache:b]
 #LINE_RECEIVER_PORT = 2103

templates/opt/graphite/webapp/graphite/local_settings.py.erb

@@ -212,7 +212,6 @@ DATABASES = {
 }
 <% end %>
 
-
 #########################
 # Cluster Configuration #
 #########################
@@ -233,6 +232,7 @@ DATABASES = {
 
 <% else %>
 CLUSTER_SERVERS = ['<%= scope.lookupvar('graphite::gr_cluster_servers').join("','") %>']
+POOL_MAX_WORKERS = <%= scope.lookupvar('graphite::gr_cluster_pool_max_workers') %>
 
 # Remote cluster settings config names changed in Graphite 1.0.
 # See https://github.com/echocat/puppet-graphite/pull/356 for more info
@@ -353,3 +353,20 @@ end
 # Configure static URL prefix for Django admin pages
 STATIC_URL = '/static/'
 <% end %>
+
+<%
+  unless scope.lookupvar('graphite::gr_tagdb') == 'internal'
+    data = scope.lookupvar('graphite::gr_tagdb_config')
+    tagdb = scope.lookupvar('graphite::gr_tagdb')
+    unless data.key?('TAGDB')
+      data['TAGDB'] = "graphite.tags.#{tagdb}.#{tagdb.capitalize}TagDB"
+    end
+    data.keys.sort.each do |key|
+-%>
+<%= key %> = <% if data[key].kind_of?(String) %>'<%= data[key] %>'<% else %><%= data[key] %><% end %>
+<%
+    end
+  end
+-%>
+
+