vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix ts_schema:verifyTagsAndMetrics checks with 0 tag/metric

Browse source
This commit is contained in:
emanuele-f 2019-05-22 11:44:49 +02:00
parent 5aaedd62e9
commit e11c101536
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/lua/modules/timeseries/ts_schema.lua
View file

@ -89,7 +89,7 @@ end
function ts_schema:allTagsDefined(tags)
for tag in pairs(self.tags) do
if not tags[tag] then
if tags[tag] == nil then
return false, tag
end
end
@ -105,7 +105,7 @@ function ts_schema:verifyTags(tags)
end
for tag in pairs(tags) do
if not self.tags[tag] then
if self.tags[tag] == nil then
traceError(TRACE_ERROR, TRACE_CONSOLE, "unknown tag '" .. tag .. "' in schema " .. self.name)
return false
end
@ -119,8 +119,8 @@ function ts_schema:verifyTagsAndMetrics(tags_and_metrics)
local metrics = {}
for tag in pairs(self.tags) do
if not tags_and_metrics[tag] then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Failing to use mandatory tag '" .. tag .. "' when working on schema " .. self.name)
if tags_and_metrics[tag] == nil then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Missing mandatory tag '" .. tag .. "' while using schema " .. self.name)
return nil
end
@ -129,8 +129,8 @@ function ts_schema:verifyTagsAndMetrics(tags_and_metrics)
for metric in pairs(self.metrics) do
if not tags_and_metrics[metric] then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Failing to use mandatory metric '" .. metric .. "' when working on schema " .. self.name)
if tags_and_metrics[metric] == nil then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Missing mandatory metric '" .. metric .. "' while using schema " .. self.name)
return nil
end
@ -138,7 +138,7 @@ function ts_schema:verifyTagsAndMetrics(tags_and_metrics)
end
for item in pairs(tags_and_metrics) do
if not self.tags[item] and not self.metrics[item] then
if((self.tags[item] == nil) and (self.metrics[item] == nil))then
traceError(TRACE_ERROR, TRACE_CONSOLE, "unknown tag/metric '" .. item .. "' in schema " .. self.name)
return nil
end