From ae4ab2115745731e0574b12557d1366266b66fc5 Mon Sep 17 00:00:00 2001
From: Mathieu Rohon <mathieu.rohon@gmail.com>
Date: Thu, 3 Aug 2017 17:25:51 +0200
Subject: [PATCH] Skydive: enable logging in file
Change-Id: I24f040b686b4dd24b26fc5c5fc5bd5e7ef8a4e70
Depends-on: I464cb4700ca143c1dbac3c20f7402ddb8cda7ce7
---
ansible/roles/common/tasks/config.yml | 1 +
.../common/templates/cron-logrotate-skydive.conf.j2 | 3 +++
ansible/roles/common/templates/cron.json.j2 | 1 +
ansible/roles/skydive/templates/skydive-agent.conf.j2 | 9 ++++++---
ansible/roles/skydive/templates/skydive-analyzer.conf.j2 | 9 ++++++---
5 files changed, 17 insertions(+), 6 deletions(-)
create mode 100644 ansible/roles/common/templates/cron-logrotate-skydive.conf.j2
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index 06a275cb46..3e10add019 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -136,6 +136,7 @@
- { name: "sahara", enabled: "{{ enable_sahara }}" }
- { name: "searchlight", enabled: "{{ enable_searchlight }}" }
- { name: "senlin", enabled: "{{ enable_senlin }}" }
+ - { name: "skydive", enabled: "{{ enable_skydive }}" }
- { name: "solum", enabled: "{{ enable_solum }}" }
- { name: "swift", enabled: "{{ enable_swift }}" }
- { name: "tacker", enabled: "{{ enable_tacker }}" }
diff --git a/ansible/roles/common/templates/cron-logrotate-skydive.conf.j2 b/ansible/roles/common/templates/cron-logrotate-skydive.conf.j2
new file mode 100644
index 0000000000..022ea99cf9
--- /dev/null
+++ b/ansible/roles/common/templates/cron-logrotate-skydive.conf.j2
@@ -0,0 +1,3 @@
+"/var/log/kolla/skydive/*.log"
+{
+}
diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2
index b1f42a3434..59f50fc2bb 100644
--- a/ansible/roles/common/templates/cron.json.j2
+++ b/ansible/roles/common/templates/cron.json.j2
@@ -44,6 +44,7 @@
( 'sahara', enable_sahara ),
( 'searchlight', enable_searchlight ),
( 'senlin', enable_senlin ),
+ ( 'skydive', enable_skydive ),
( 'solum', enable_solum ),
( 'swift', enable_swift ),
( 'tacker', enable_tacker ),
diff --git a/ansible/roles/skydive/templates/skydive-agent.conf.j2 b/ansible/roles/skydive/templates/skydive-agent.conf.j2
index 8985b11b68..a1efad7f9f 100644
--- a/ansible/roles/skydive/templates/skydive-agent.conf.j2
+++ b/ansible/roles/skydive/templates/skydive-agent.conf.j2
@@ -6,9 +6,12 @@ auth:
analyzer_password: {{ openstack_auth['password'] }}
logging:
- default: DEBUG
- topology/probes: INFO
- topology/graph: INFO
+ level: INFO
+ backends:
+ - stderr
+ - file
+ file:
+ path: /var/log/kolla/skydive/skydive-agent.log
openstack:
auth_url: {{ keystone_public_url }}/v3
diff --git a/ansible/roles/skydive/templates/skydive-analyzer.conf.j2 b/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
index 9206832360..428d7e8292 100644
--- a/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
+++ b/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
@@ -4,9 +4,12 @@ auth:
type: keystone
logging:
- default: DEBUG
- topology/probes: INFO
- topology/graph: INFO
+ level: INFO
+ backends:
+ - stderr
+ - file
+ file:
+ path: /var/log/kolla/skydive/skydive-analyzer.log
openstack:
auth_url: {{ keystone_public_url }}/v3
--
GitLab