add grafana log in heka

Change-Id: I38b57cc43411b703dbb0639a600aaef58e01bc38
Closes-Bug: #1631818
This commit is contained in:
zhubingbing 2016-10-10 01:02:13 +00:00
parent 9a35c0e679
commit 504852d528
7 changed files with 106 additions and 0 deletions

View File

@ -30,6 +30,7 @@
- { name: "elasticsearch", enabled: "{{ enable_central_logging }}" } - { name: "elasticsearch", enabled: "{{ enable_central_logging }}" }
- { name: "global", enabled: "yes" } - { name: "global", enabled: "yes" }
- { name: "gnocchi", enabled: "{{ enable_gnocchi }}" } - { name: "gnocchi", enabled: "{{ enable_gnocchi }}" }
- { name: "grafana", enabled: "{{ enable_grafana }}" }
- { name: "haproxy", enabled: "{{ enable_haproxy }}" } - { name: "haproxy", enabled: "{{ enable_haproxy }}" }
- { name: "horizon", enabled: "{{ enable_horizon }}" } - { name: "horizon", enabled: "{{ enable_horizon }}" }
- { name: "keepalived", enabled: "{{ enable_haproxy }}" } - { name: "keepalived", enabled: "{{ enable_haproxy }}" }
@ -77,6 +78,7 @@
- { name: "glance", enabled: "{{ enable_glance }}" } - { name: "glance", enabled: "{{ enable_glance }}" }
- { name: "global", enabled: "yes" } - { name: "global", enabled: "yes" }
- { name: "gnocchi", enabled: "{{ enable_gnocchi }}" } - { name: "gnocchi", enabled: "{{ enable_gnocchi }}" }
- { name: "grafana", enabled: "{{ enable_grafana }}" }
- { name: "haproxy", enabled: "{{ enable_haproxy }}" } - { name: "haproxy", enabled: "{{ enable_haproxy }}" }
- { name: "heat", enabled: "{{ enable_heat }}" } - { name: "heat", enabled: "{{ enable_heat }}" }
- { name: "keepalived", enabled: "{{ enable_haproxy }}" } - { name: "keepalived", enabled: "{{ enable_haproxy }}" }

View File

@ -0,0 +1,3 @@
"/var/log/kolla/grafana/*.log"
{
}

View File

@ -7,6 +7,7 @@
( 'cloudkitty', enable_cloudkitty ), ( 'cloudkitty', enable_cloudkitty ),
( 'glance', enable_glance ), ( 'glance', enable_glance ),
( 'gnocchi', enable_gnocchi ), ( 'gnocchi', enable_gnocchi ),
( 'grafana', enable_grafana ),
( 'haproxy', enable_haproxy ), ( 'haproxy', enable_haproxy ),
( 'heat', enable_heat ), ( 'heat', enable_heat ),
( 'keepalived', enable_haproxy ), ( 'keepalived', enable_haproxy ),

View File

@ -0,0 +1,18 @@
[grafana_log_decoder]
type = "SandboxDecoder"
filename = "lua_decoders/os_grafana_log.lua"
[grafana_log_splitter]
type = "RegexSplitter"
delimiter = '\n\n(=[^=]+====)'
delimiter_eol = false
deliver_incomplete_final = true
[grafana_logstreamer_input]
type = "LogstreamerInput"
decoder = "grafana_log_decoder"
splitter = "grafana_log_splitter"
log_directory = "/var/log/kolla"
file_match = 'grafana/(?P<Service>grafana.*)\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"]
differentiator = ["Service"]

View File

@ -29,6 +29,13 @@
"perm": "0600", "perm": "0600",
"optional": {{ (not enable_gnocchi | bool) | string | lower }} "optional": {{ (not enable_gnocchi | bool) | string | lower }}
}, },
{
"source": "{{ container_config_directory }}/heka-grafana.toml",
"dest": "/etc/heka/heka-grafana.toml",
"owner": "heka",
"perm": "0600",
"optional": {{ (not enable_grafana | bool) | string | lower }}
},
{ {
"source": "{{ container_config_directory }}/heka-barbican.toml", "source": "{{ container_config_directory }}/heka-barbican.toml",
"dest": "/etc/heka/heka-barbican.toml", "dest": "/etc/heka/heka-barbican.toml",

View File

@ -0,0 +1,72 @@
-- Copyright 2015-2016 Mirantis, Inc.
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
local dt = require "date_time"
local l = require 'lpeg'
l.locale(l)
local patt = require 'os_patterns'
local utils = require 'os_utils'
local msg = {
Timestamp = nil,
Type = 'log',
Hostname = nil,
Payload = nil,
Pid = nil,
Fields = nil,
Severity = nil,
}
-- Grafana message logs are formatted like this:
-- =ERROR REPORT==== 2-Jan-2015::09:17:22 ===
-- Blabla
-- Blabla
--
local message = l.Cg(patt.Message / utils.chomp, "Message")
-- The token before 'REPORT' isn't standardized so it can be a valid severity
-- level as 'INFO' or 'ERROR' but also 'CRASH' or 'SUPERVISOR'.
local severity = l.Cg(l.R"AZ"^1, "SeverityLabel")
local day = l.R"13" * l.R"09" + l.R"19"
local datetime = l.Cg(day, "day") * patt.dash * dt.date_mabbr * patt.dash * dt.date_fullyear *
"::" * dt.rfc3339_partial_time
local timestamp = l.Cg(l.Ct(datetime)/ dt.time_to_ns, "Timestamp")
local grammar = l.Ct("=" * severity * " REPORT==== " * timestamp * " ===" * l.P'\n' * message)
function process_message ()
local log = read_message("Payload")
local m = grammar:match(log)
if not m then
return -1
end
msg.Timestamp = m.Timestamp
msg.Payload = m.Message
msg.Logger = read_message("Logger")
if utils.label_to_severity_map[m.SeverityLabel] then
msg.Severity = utils.label_to_severity_map[m.SeverityLabel]
elseif m.SeverityLabel == 'CRASH' then
msg.Severity = 2 -- CRITICAL
else
msg.Severity = 5 -- NOTICE
end
msg.Fields = {}
msg.Fields.severity_label = utils.severity_to_label_map[msg.Severity]
msg.Fields.programname = 'grafana'
return utils.safe_inject_message(msg)
end

View File

@ -0,0 +1,3 @@
---
features:
- add grafana log in heka