dashboard: rename template files

add .j2 to all templates file related to dashboard roles.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3578d576a4)
pull/3999/head
Guillaume Abrioux 2019-05-13 16:21:16 +02:00
parent db3f0088fc
commit 997d179b7c
15 changed files with 30 additions and 30 deletions

View File

@ -20,19 +20,19 @@
- name: write grafana.ini
template:
src: grafana.ini
src: grafana.ini.j2
dest: /etc/grafana/grafana.ini
mode: 0640
- name: write datasources provisioning config file
template:
src: datasources-ceph-dashboard.yml
src: datasources-ceph-dashboard.yml.j2
dest: /etc/grafana/provisioning/datasources/ceph-dashboard.yml
mode: 0640
- name: Write dashboards provisioning config file
template:
src: dashboards-ceph-dashboard.yml
src: dashboards-ceph-dashboard.yml.j2
dest: /etc/grafana/provisioning/dashboards/ceph-dashboard.yml
mode: 0640

View File

@ -48,8 +48,8 @@
- name: ship systemd service
template:
src: grafana-server.service
dest: "/etc/systemd/system/"
src: grafana-server.service.j2
dest: "/etc/systemd/system/grafana-server.service"
owner: root
group: root
mode: 0644

View File

@ -1,19 +0,0 @@
# This file is managed by ansible, don't make changes here - they will be
# overwritten.
[Unit]
Description=grafana-server
{% if container_binary == 'docker' %}
After=docker.service
{% endif %}
[Service]
EnvironmentFile=-/etc/environment
ExecStart=/usr/bin/{{ container_binary }} start --attach grafana-server
ExecStop=-/usr/bin/{{ container_binary }} stop grafana-server
Restart=always
RestartSec=10s
TimeoutStartSec=120
TimeoutStopSec=15
[Install]
WantedBy=multi-user.target

View File

@ -0,0 +1,19 @@
# This file is managed by ansible, don't make changes here - they will be
# overwritten.
[Unit]
Description=grafana-server
{% if container_binary == 'docker' %}
After=docker.service
{% endif %}
[Service]
EnvironmentFile=-/etc/environment
ExecStart=/usr/bin/{{ container_binary }} start --attach grafana-server
ExecStop=-/usr/bin/{{ container_binary }} stop grafana-server
Restart=always
RestartSec=10s
TimeoutStartSec=120
TimeoutStopSec=15
[Install]
WantedBy=multi-user.target

View File

@ -29,8 +29,8 @@
- name: ship systemd service
template:
src: node_exporter.service
dest: "/etc/systemd/system/"
src: node_exporter.service.j2
dest: "/etc/systemd/system/node_exporter.service"
owner: root
group: root
mode: 0644

View File

@ -10,7 +10,7 @@
- name: write prometheus config file
template:
src: prometheus.yml
src: prometheus.yml.j2
dest: "{{ prometheus_conf_dir }}/"
owner: "{{ prometheus_user_id }}"
notify: service handler
@ -40,7 +40,7 @@
- name: write alertmanager config file
template:
src: alertmanager.yml
src: alertmanager.yml.j2
dest: "{{ alertmanager_conf_dir }}/"
owner: "root"
notify: service handler

View File

@ -62,8 +62,8 @@
- name: ship systemd services
template:
src: "{{ item }}"
dest: "/etc/systemd/system/"
src: "{{ item }}.j2"
dest: "/etc/systemd/system/{{ item }}"
owner: root
group: root
mode: 0644