Skip to content
This repository has been archived by the owner on Aug 9, 2021. It is now read-only.

Commit

Permalink
Regenerated output manifests
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbartelmess
tbartelmess committed Sep 11, 2013
1 parent 1af01dc commit c4905d0
Show file tree
Hide file tree
Showing 47 changed files with 120 additions and 120 deletions.
4 changes: 2 additions & 2 deletions manifests/output/amqp.pp
View file
Expand Up @@ -147,13 +147,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_amqp_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/amqp/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_amqp_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/amqp/${name}"

}
Expand Down
4 changes: 2 additions & 2 deletions manifests/output/boundary.pp
View file
Expand Up @@ -137,13 +137,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_boundary_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/boundary/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_boundary_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/boundary/${name}"

}
Expand Down
6 changes: 3 additions & 3 deletions manifests/output/circonus.pp
View file
Expand Up @@ -98,13 +98,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_circonus_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/circonus/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_circonus_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/circonus/${name}"

}
Expand Down Expand Up @@ -134,7 +134,7 @@
if ($annotation != '') {
validate_hash($annotation)
$var_annotation = $annotation
$arr_annotation = inline_template('<%= "["+var_annotation.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_annotation = inline_template('<%= "["+@var_annotation.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_annotation = " annotation => ${arr_annotation}\n"
}

Expand Down
6 changes: 3 additions & 3 deletions manifests/output/cloudwatch.pp
View file
Expand Up @@ -264,13 +264,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_cloudwatch_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/cloudwatch/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_cloudwatch_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/cloudwatch/${name}"

}
Expand Down Expand Up @@ -305,7 +305,7 @@
if ($dimensions != '') {
validate_hash($dimensions)
$var_dimensions = $dimensions
$arr_dimensions = inline_template('<%= "["+var_dimensions.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_dimensions = inline_template('<%= "["+@var_dimensions.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_dimensions = " dimensions => ${arr_dimensions}\n"
}

Expand Down
4 changes: 2 additions & 2 deletions manifests/output/datadog.pp
View file
Expand Up @@ -129,13 +129,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_datadog_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/datadog/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_datadog_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/datadog/${name}"

}
Expand Down
4 changes: 2 additions & 2 deletions manifests/output/elasticsearch.pp
View file
Expand Up @@ -178,13 +178,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_elasticsearch_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/elasticsearch/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_elasticsearch_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/elasticsearch/${name}"

}
Expand Down
4 changes: 2 additions & 2 deletions manifests/output/elasticsearch_http.pp
View file
Expand Up @@ -123,13 +123,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_elasticsearch_http_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/elasticsearch_http/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_elasticsearch_http_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/elasticsearch_http/${name}"

}
Expand Down
4 changes: 2 additions & 2 deletions manifests/output/elasticsearch_river.pp
View file
Expand Up @@ -221,13 +221,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_elasticsearch_river_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/elasticsearch_river/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_elasticsearch_river_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/elasticsearch_river/${name}"

}
Expand Down
8 changes: 4 additions & 4 deletions manifests/output/email.pp
View file
Expand Up @@ -180,13 +180,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_email_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/email/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_email_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/email/${name}"

}
Expand Down Expand Up @@ -222,14 +222,14 @@
if ($match != '') {
validate_hash($match)
$var_match = $match
$arr_match = inline_template('<%= "["+var_match.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_match = inline_template('<%= "["+@var_match.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_match = " match => ${arr_match}\n"
}

if ($options != '') {
validate_hash($options)
$var_options = $options
$arr_options = inline_template('<%= "["+var_options.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_options = inline_template('<%= "["+@var_options.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_options = " options => ${arr_options}\n"
}

Expand Down
4 changes: 2 additions & 2 deletions manifests/output/exec.pp
View file
Expand Up @@ -82,13 +82,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_exec_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/exec/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_exec_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/exec/${name}"

}
Expand Down
4 changes: 2 additions & 2 deletions manifests/output/file.pp
View file
Expand Up @@ -114,13 +114,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_file_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/file/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_file_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/file/${name}"

}
Expand Down
4 changes: 2 additions & 2 deletions manifests/output/ganglia.pp
View file
Expand Up @@ -131,13 +131,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_ganglia_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/ganglia/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_ganglia_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/ganglia/${name}"

}
Expand Down
6 changes: 3 additions & 3 deletions manifests/output/gelf.pp
View file
Expand Up @@ -194,13 +194,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_gelf_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/gelf/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_gelf_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/gelf/${name}"

}
Expand Down Expand Up @@ -252,7 +252,7 @@
if ($custom_fields != '') {
validate_hash($custom_fields)
$var_custom_fields = $custom_fields
$arr_custom_fields = inline_template('<%= "["+var_custom_fields.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_custom_fields = inline_template('<%= "["+@var_custom_fields.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_custom_fields = " custom_fields => ${arr_custom_fields}\n"
}

Expand Down
4 changes: 2 additions & 2 deletions manifests/output/gemfire.pp
View file
Expand Up @@ -106,13 +106,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_gemfire_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/gemfire/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_gemfire_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/gemfire/${name}"

}
Expand Down
6 changes: 3 additions & 3 deletions manifests/output/graphite.pp
View file
Expand Up @@ -155,13 +155,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_graphite_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/graphite/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_graphite_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/graphite/${name}"

}
Expand Down Expand Up @@ -218,7 +218,7 @@
if ($metrics != '') {
validate_hash($metrics)
$var_metrics = $metrics
$arr_metrics = inline_template('<%= "["+var_metrics.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_metrics = inline_template('<%= "["+@var_metrics.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_metrics = " metrics => ${arr_metrics}\n"
}

Expand Down
6 changes: 3 additions & 3 deletions manifests/output/graphtastic.pp
View file
Expand Up @@ -151,13 +151,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_graphtastic_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/graphtastic/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_graphtastic_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/graphtastic/${name}"

}
Expand Down Expand Up @@ -187,7 +187,7 @@
if ($metrics != '') {
validate_hash($metrics)
$var_metrics = $metrics
$arr_metrics = inline_template('<%= "["+var_metrics.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_metrics = inline_template('<%= "["+@var_metrics.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_metrics = " metrics => ${arr_metrics}\n"
}

Expand Down
4 changes: 2 additions & 2 deletions manifests/output/hipchat.pp
View file
Expand Up @@ -115,13 +115,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_hipchat_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/hipchat/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_hipchat_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/hipchat/${name}"

}
Expand Down
8 changes: 4 additions & 4 deletions manifests/output/http.pp
View file
Expand Up @@ -135,13 +135,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_http_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/http/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_http_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/http/${name}"

}
Expand Down Expand Up @@ -176,14 +176,14 @@
if ($headers != '') {
validate_hash($headers)
$var_headers = $headers
$arr_headers = inline_template('<%= "["+var_headers.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_headers = inline_template('<%= "["+@var_headers.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_headers = " headers => ${arr_headers}\n"
}

if ($mapping != '') {
validate_hash($mapping)
$var_mapping = $mapping
$arr_mapping = inline_template('<%= "["+var_mapping.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$arr_mapping = inline_template('<%= "["+@var_mapping.sort.collect { |k,v| "\"#{k}\", \"#{v}\"" }.join(", ")+"]" %>')
$opt_mapping = " mapping => ${arr_mapping}\n"
}

Expand Down
4 changes: 2 additions & 2 deletions manifests/output/internal.pp
View file
Expand Up @@ -71,13 +71,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_internal_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/internal/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_internal_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/internal/${name}"

}
Expand Down
4 changes: 2 additions & 2 deletions manifests/output/irc.pp
View file
Expand Up @@ -134,13 +134,13 @@

$confdirstart = prefix($instances, "${logstash::configdir}/")
$conffiles = suffix($confdirstart, "/config/output_irc_${name}")
$services = prefix($instances, 'logstash-')
$services = prefix($instances, $logstash::params::service_base_name)
$filesdir = "${logstash::configdir}/files/output/irc/${name}"

} else {

$conffiles = "${logstash::configdir}/conf.d/output_irc_${name}"
$services = 'logstash'
$services = $logstash::params::service_name
$filesdir = "${logstash::configdir}/files/output/irc/${name}"

}
Expand Down

0 comments on commit c4905d0

Please sign in to comment.