hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1775 Add default implementations

Browse Source
This commit is contained in:
Johan Wikman
2018-05-25 16:17:44 +03:00
parent 9b7e37e112
commit ebcb807438
10 changed files with 47 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/monitor/auroramon/auroramon.cc
View File

@ -40,20 +40,6 @@ AuroraMonitor* AuroraMonitor::create(MXS_MONITOR* monitor)
return new AuroraMonitor(monitor);
}
void AuroraMonitor::diagnostics(DCB *dcb) const
{
}
json_t* AuroraMonitor::diagnostics_json() const
{
return NULL;
}
bool AuroraMonitor::configure(const MXS_CONFIG_PARAMETER* params)
{
return true;
}
bool AuroraMonitor::has_sufficient_permissions() const
{
return check_monitor_permissions(m_monitor, "SELECT @@aurora_server_id, server_id FROM "

3
server/modules/monitor/auroramon/auroramon.hh
View File

@ -28,11 +28,8 @@ public:
~AuroraMonitor();
static AuroraMonitor* create(MXS_MONITOR* monitor);
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
protected:
bool configure(const MXS_CONFIG_PARAMETER* params);
bool has_sufficient_permissions() const;
void update_server_status(MXS_MONITORED_SERVER* monitored_server);

7
server/modules/monitor/galeramon/galeramon.cc
View File

@ -109,18 +109,13 @@ void GaleraMonitor::diagnostics(DCB *dcb) const
json_t* GaleraMonitor::diagnostics_json() const
{
json_t* rval = json_object();
json_t* rval = MonitorInstance::diagnostics_json();
json_object_set_new(rval, "disable_master_failback", json_boolean(m_disableMasterFailback));
json_object_set_new(rval, "disable_master_role_setting", json_boolean(m_disableMasterRoleSetting));
json_object_set_new(rval, "root_node_as_master", json_boolean(m_root_node_as_master));
json_object_set_new(rval, "use_priority", json_boolean(m_use_priority));
json_object_set_new(rval, "set_donor_nodes", json_boolean(m_set_donor_nodes));
if (!script().empty())
{
json_object_set_new(rval, "script", json_string(script().c_str()));
}
if (m_cluster_info.c_uuid)
{
json_object_set_new(rval, "cluster_uuid", json_string(m_cluster_info.c_uuid));

14
server/modules/monitor/grmon/grmon.cc
View File

@ -40,20 +40,6 @@ GRMon* GRMon::create(MXS_MONITOR* monitor)
return new GRMon(monitor);
}
void GRMon::diagnostics(DCB* dcb) const
{
}
json_t* GRMon::diagnostics_json() const
{
return NULL;
}
bool GRMon::configure(const MXS_CONFIG_PARAMETER* params)
{
return true;
}
bool GRMon::has_sufficient_permissions() const
{
return true;

3
server/modules/monitor/grmon/grmon.hh
View File

@ -28,11 +28,8 @@ public:
~GRMon();
static GRMon* create(MXS_MONITOR* monitor);
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
protected:
bool configure(const MXS_CONFIG_PARAMETER* params);
bool has_sufficient_permissions() const;
void update_server_status(MXS_MONITORED_SERVER* monitored_server);

2
server/modules/monitor/mmmon/mmmon.cc
View File

@ -59,7 +59,7 @@ void MMMonitor::diagnostics(DCB *dcb) const
json_t* MMMonitor::diagnostics_json() const
{
json_t* rval = json_object();
json_t* rval = MonitorInstance::diagnostics_json();
json_object_set_new(rval, "detect_stale_master", json_boolean(m_detectStaleMaster));
return rval;
}

14
server/modules/monitor/ndbclustermon/ndbclustermon.cc
View File

@ -38,20 +38,6 @@ NDBCMonitor* NDBCMonitor::create(MXS_MONITOR* monitor)
return new NDBCMonitor(monitor);
}
void NDBCMonitor::diagnostics(DCB *dcb) const
{
}
json_t* NDBCMonitor::diagnostics_json() const
{
return NULL;
}
bool NDBCMonitor::configure(const MXS_CONFIG_PARAMETER* params)
{
return true;
}
bool NDBCMonitor::has_sufficient_permissions() const
{
return check_monitor_permissions(m_monitor, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'");

3
server/modules/monitor/ndbclustermon/ndbclustermon.hh
View File

@ -28,11 +28,8 @@ public:
~NDBCMonitor();
static NDBCMonitor* create(MXS_MONITOR* monitor);
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
protected:
bool configure(const MXS_CONFIG_PARAMETER* params);
bool has_sufficient_permissions() const;
void update_server_status(MXS_MONITORED_SERVER* monitored_server);