Add CompatUtility::GetModifiedAttributesList() for Livestatus.

[icinga2] / components / livestatus / commandstable.cpp

diff --git a/components/livestatus/commandstable.cpp b/components/livestatus/commandstable.cpp
index ecbcfb91d9b3489aef181f61ae755dd937e3ddf1..d945326b0bdc7c045938974a04ae2c756fc5ef69 100644 (file)
--- a/components/livestatus/commandstable.cpp
+++ b/components/livestatus/commandstable.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/)        *
+ * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -22,6 +22,7 @@
 #include "icinga/checkcommand.h"
 #include "icinga/eventcommand.h"
 #include "icinga/notificationcommand.h"
+#include "icinga/compatutility.h"
 #include "base/dynamictype.h"
 #include "base/objectlock.h"
 #include "base/convert.h"
@@ -29,7 +30,6 @@
 #include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 CommandsTable::CommandsTable(void)
 {
@@ -41,6 +41,11 @@ void CommandsTable::AddColumns(Table *table, const String& prefix,
 {
        table->AddColumn(prefix + "name", Column(&CommandsTable::NameAccessor, objectAccessor));
        table->AddColumn(prefix + "line", Column(&CommandsTable::LineAccessor, objectAccessor));
+       table->AddColumn(prefix + "custom_variable_names", Column(&CommandsTable::CustomVariableNamesAccessor, objectAccessor));
+       table->AddColumn(prefix + "custom_variable_values", Column(&CommandsTable::CustomVariableValuesAccessor, objectAccessor));
+       table->AddColumn(prefix + "custom_variables", Column(&CommandsTable::CustomVariablesAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes", Column(&CommandsTable::ModifiedAttributesAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes_list", Column(&CommandsTable::ModifiedAttributesListAccessor, objectAccessor));
 }
 
 String CommandsTable::GetName(void) const
@@ -50,13 +55,13 @@ String CommandsTable::GetName(void) const
 
 void CommandsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("CheckCommand")) {
+       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects<CheckCommand>()) {
                addRowFn(object);
        }
-       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("EventCommand")) {
+       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects<EventCommand>()) {
                addRowFn(object);
        }
-       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("NotificationCommand")) {
+       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects<NotificationCommand>()) {
                addRowFn(object);
        }
 }
@@ -65,6 +70,9 @@ Value CommandsTable::NameAccessor(const Value& row)
 {
        String buf;
        Command::Ptr command = static_cast<Command::Ptr>(row);
+       
+       if (!command)
+               return Empty;
 
        if (command->GetType() == DynamicType::GetByName("CheckCommand"))
                buf += "check_";
@@ -82,6 +90,9 @@ Value CommandsTable::LineAccessor(const Value& row)
 {
        String buf;
        Command::Ptr command = static_cast<Command::Ptr>(row);
+       
+       if (!command)
+               return Empty;
 
        Value commandLine = command->GetCommandLine();
 
@@ -106,3 +117,111 @@ Value CommandsTable::LineAccessor(const Value& row)
 
        return buf;
 }
+
+Value CommandsTable::CustomVariableNamesAccessor(const Value& row)
+{
+       Command::Ptr command = static_cast<Command::Ptr>(row);
+
+       if (!command)
+               return Empty;
+
+       Dictionary::Ptr vars;
+
+       {
+               ObjectLock olock(command);
+               vars = CompatUtility::GetCustomAttributeConfig(command);
+       }
+
+       if (!vars)
+               return Empty;
+
+       Array::Ptr cv = make_shared<Array>();
+
+       String key;
+       Value value;
+       BOOST_FOREACH(tie(key, value), vars) {
+               cv->Add(key);
+       }
+
+       return cv;
+}
+
+Value CommandsTable::CustomVariableValuesAccessor(const Value& row)
+{
+       Command::Ptr command = static_cast<Command::Ptr>(row);
+
+       if (!command)
+               return Empty;
+
+       Dictionary::Ptr vars;
+
+       {
+               ObjectLock olock(command);
+               vars = CompatUtility::GetCustomAttributeConfig(command);
+       }
+
+       if (!vars)
+               return Empty;
+
+       Array::Ptr cv = make_shared<Array>();
+
+       String key;
+       Value value;
+       BOOST_FOREACH(tie(key, value), vars) {
+               cv->Add(value);
+       }
+
+       return cv;
+}
+
+Value CommandsTable::CustomVariablesAccessor(const Value& row)
+{
+       Command::Ptr command = static_cast<Command::Ptr>(row);
+
+       if (!command)
+               return Empty;
+
+       Dictionary::Ptr vars;
+
+       {
+               ObjectLock olock(command);
+               vars = CompatUtility::GetCustomAttributeConfig(command);
+       }
+
+       if (!vars)
+               return Empty;
+
+       Array::Ptr cv = make_shared<Array>();
+
+       String key;
+       Value value;
+       BOOST_FOREACH(tie(key, value), vars) {
+               Array::Ptr key_val = make_shared<Array>();
+               key_val->Add(key);
+               key_val->Add(value);
+               cv->Add(key_val);
+       }
+
+       return cv;
+}
+
+Value CommandsTable::ModifiedAttributesAccessor(const Value& row)
+{
+       Command::Ptr command = static_cast<Command::Ptr>(row);
+
+       if (!command)
+               return Empty;
+
+       /* not supported */
+       return command->GetModifiedAttributes();
+}
+
+Value CommandsTable::ModifiedAttributesListAccessor(const Value& row)
+{
+       Command::Ptr command = static_cast<Command::Ptr>(row);
+
+       if (!command)
+               return Empty;
+
+       return CompatUtility::GetModifiedAttributesList(command);
+}