Skip to content

Commit

Permalink
fix(pre-commit): run end-of-file-fixer & trailing-whitespace [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
jengsala authored and myii committed May 24, 2022
1 parent 82d7104 commit 31fa9fe
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 19 deletions.
22 changes: 11 additions & 11 deletions collectd/files/postgresql.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,52 +13,52 @@ LoadPlugin postgresql
<Query {{ query.name }}>
{%- if query.statement is defined and query.statement %}
Statement "{{ query.statement }}"
{%- endif %}
{%- endif %}
{%- if query.param is defined and query.param %}
Param "{{ query.param }}"
{%- endif %}
{%- for result in query.results %}
{%- for result in query.results %}
<Result>
{%- if result.type is defined and result.type %}
Type {{ result.type }}
{%- endif %}
{%- if result.instanceprefix is defined and result.instanceprefix %}
InstancePrefix "{{ result.instanceprefix }}"
{%- endif %}
{%- endif %}
{%- if result.instancesfrom is defined and result.instancesfrom %}
InstancesFrom "{{ result.instancesfrom }}"
{%- endif %}
{%- endif %}
{%- if result.valuesfrom is defined and result.valuesfrom %}
ValuesFrom "{{ result.valuesfrom }}"
{%- endif %}
</Result>
{%- endfor %}
</Query>
</Query>
{%- endfor %}

{%- for db in collectd_settings.plugins.postgresql.databases %}
<Database {{ db.name }}>
{%- if db.host is defined and db.host %}
Host "{{ db.host }}"
{%- endif %}
{%- endif %}
{%- if db.port is defined and db.port %}
Port "{{ db.port }}"
{%- endif %}
{%- endif %}
{%- if db.user is defined and db.user %}
User "{{ db.user }}"
{%- endif %}
{%- endif %}
{%- if db.pass is defined and db.pass %}
Password "{{ db.pass }}"
{%- endif %}
{%- endif %}
{%- if db.sslmode is defined and db.sslmode %}
SSLMode "{{ db.sslmode }}"
{%- endif %}
{%- endif %}
{%- if db.krbsrvname is defined and db.krbsrvname %}
KRBSrvName "{{ db.krbsrvname }}"
{%- endif %}
{%- if db.service is defined and db.service %}
Service "{{ db.service }}"
{%- endif %}
{%- endif %}
{%- if db.interval is defined and db.interval %}
Interval "{{ db.interval }}"
{%- endif %}
Expand Down
2 changes: 1 addition & 1 deletion collectd/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,4 @@
{% do default_settings.collectd.update(os_map) %}

{# Update settings defaults from pillar data #}
{% set collectd_settings = salt['pillar.get']('collectd', default=default_settings.collectd, merge=True) %}
{% set collectd_settings = salt['pillar.get']('collectd', default=default_settings.collectd, merge=True) %}
1 change: 0 additions & 1 deletion collectd/openldap.sls
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ include:
- template: jinja
- watch_in:
- service: collectd-service
1 change: 0 additions & 1 deletion collectd/openvpn.sls
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ include:
- template: jinja
- watch_in:
- service: collectd-service
3 changes: 2 additions & 1 deletion collectd/postgresql.sls
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
include:
- collectd
# Install the required dependency package corresponding to the OS
collectd-postgresql-pkg-installed:
pkg.installed:
- name: {{ collectd_settings.plugin_postgresql.pkg }}
Expand All @@ -18,4 +19,4 @@ collectd-postgresql-pkg-installed:
- watch_in:
- service: collectd-service
- require:
- pkg: collectd-postgresql-pkg-installed
- pkg: collectd-postgresql-pkg-installed
1 change: 0 additions & 1 deletion collectd/rabbitmq.sls
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ collectd-rabbitmq-module:
- template: jinja
- watch_in:
- service: collectd-service
1 change: 0 additions & 1 deletion collectd/redis.sls
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ libhiredis0.13:
- template: jinja
- watch_in:
- service: collectd-service
1 change: 0 additions & 1 deletion collectd/tcpconns.sls
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ include:
- template: jinja
- watch_in:
- service: collectd-service
1 change: 0 additions & 1 deletion collectd/zookeeper.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ include:
- template: jinja
- watch_in:
- service: collectd-service

0 comments on commit 31fa9fe

Please sign in to comment.