You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/01/30 11:39:17 UTC
[cloudstack] branch master updated (f1149bc -> c0abfce)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from f1149bc [CLOUDSTACK-10408] Fix String.replaceAll() to replace() for bet… (#3275)
add c0abfce Health check feature for virtual router (#3575)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 15 +-
.../java/com/cloud/network/NetworkService.java | 4 +-
.../com/cloud/network/RouterHealthCheckResult.java | 36 +-
.../network/VirtualNetworkApplianceService.java | 18 +-
.../java/com/cloud/network/vpc/VpcService.java | 6 +-
.../org/apache/cloudstack/api/ApiConstants.java | 8 +
.../apache/cloudstack/api/ResponseGenerator.java | 4 +
.../admin/internallb/ListInternalLBVMsCmd.java | 10 +
.../router/GetRouterHealthCheckResultsCmd.java | 117 ++++
.../api/command/admin/router/ListRoutersCmd.java | 10 +
.../command/user/network/RestartNetworkCmd.java | 2 +-
.../api/command/user/vpc/RestartVPCCmd.java | 2 +-
.../api/response/DomainRouterResponse.java | 28 +-
.../response/RouterHealthCheckResultResponse.java | 88 +++
.../RouterHealthCheckResultsListResponse.java | 52 ++
.../org/apache/cloudstack/query/QueryService.java | 4 +
.../routing/GetRouterMonitorResultsAnswer.java} | 40 +-
.../routing/GetRouterMonitorResultsCommand.java} | 38 +-
.../LoadRouterHealthChecksConfigCommand.java} | 39 +-
.../agent/api/routing/NetworkElementCommand.java | 1 -
.../api/routing/SetMonitorServiceCommand.java | 46 +-
.../agent/resource/virtualnetwork/VRScripts.java | 3 +
.../virtualnetwork/VirtualRoutingResource.java | 75 ++-
.../facade/AbstractConfigItemFacade.java | 5 +-
.../facade/SetMonitorServiceConfigItem.java | 39 +-
.../resource/virtualnetwork/model/ConfigBase.java | 7 +
.../virtualnetwork/model/MonitorService.java | 60 +-
.../engine/orchestration/VolumeOrchestrator.java | 2 +-
.../network/dao/RouterHealthCheckResultDao.java | 49 ++
.../dao/RouterHealthCheckResultDaoImpl.java | 84 +++
.../network/dao/RouterHealthCheckResultVO.java | 129 ++++
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41300to41400.sql | 15 +
.../networkservice/BareMetalResourceBase.java | 20 +-
.../resource/HypervDirectConnectResource.java | 5 +
.../contrail/management/NetworkProviderTest.java | 47 +-
.../datastore/provider/DateraHostListener.java | 32 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 57 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 23 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 66 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 25 +-
.../network/firewall/FirewallManagerImpl.java | 9 +-
.../cloud/network/router/NetworkHelperImpl.java | 2 +-
.../router/VirtualNetworkApplianceManager.java | 43 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 741 +++++++++++++++++++--
.../VpcVirtualNetworkApplianceManagerImpl.java | 71 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 18 +-
.../com/cloud/server/ManagementServerImpl.java | 2 +
.../test/java/com/cloud/keystore/KeystoreTest.java | 9 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 7 +-
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 5 +
.../logrotate.d/monitor} | 17 +-
.../logrotate.d/routerServiceMonitor} | 17 +-
systemvm/debian/opt/cloud/bin/cs/CsMonitor.py | 68 +-
systemvm/debian/opt/cloud/bin/cs_monitorservice.py | 11 +
...onitorservice.py => getRouterMonitorResults.sh} | 40 +-
systemvm/debian/opt/cloud/bin/merge.py | 1 +
systemvm/debian/opt/cloud/bin/update_config.py | 6 +-
.../health_checks/__init__.py} | 11 +-
.../debian/root/health_checks/cpu_usage_check.py | 56 ++
systemvm/debian/root/health_checks/dhcp_check.py | 69 ++
.../debian/root/health_checks/disk_space_check.py | 47 ++
systemvm/debian/root/health_checks/dns_check.py | 59 ++
.../debian/root/health_checks/gateways_check.py | 57 ++
.../debian/root/health_checks/haproxy_check.py | 134 ++++
.../debian/root/health_checks/iptables_check.py | 81 +++
.../root/health_checks/memory_usage_check.py | 55 ++
.../root/health_checks/router_version_check.py | 83 +++
.../health_checks/utility/__init__.py} | 10 +-
.../root/health_checks/utility/sharedFunctions.py | 54 ++
systemvm/debian/root/monitorServices.py | 266 ++++----
test/integration/component/test_routers.py | 72 +-
.../scripts/configure_systemvm_services.sh | 1 +
ui/l10n/en.js | 10 +
ui/scripts/cloudStack.js | 134 ++--
ui/scripts/sharedFunctions.js | 1 +
ui/scripts/system.js | 213 +++++-
ui/scripts/ui/widgets/listView.js | 7 +-
78 files changed, 3209 insertions(+), 590 deletions(-)
copy core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java => api/src/main/java/com/cloud/network/RouterHealthCheckResult.java (50%)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultsListResponse.java
copy core/src/main/java/com/cloud/agent/{resource/virtualnetwork/model/MonitorService.java => api/routing/GetRouterMonitorResultsAnswer.java} (52%)
copy core/src/main/java/com/cloud/agent/{resource/virtualnetwork/model/MonitorService.java => api/routing/GetRouterMonitorResultsCommand.java} (52%)
copy core/src/main/java/com/cloud/agent/{resource/virtualnetwork/model/MonitorService.java => api/routing/LoadRouterHealthChecksConfigCommand.java} (52%)
create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDao.java
create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDaoImpl.java
create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultVO.java
copy systemvm/debian/{opt/cloud/bin/cs_monitorservice.py => etc/logrotate.d/monitor} (85%)
mode change 100755 => 100644
copy systemvm/debian/{opt/cloud/bin/cs_monitorservice.py => etc/logrotate.d/routerServiceMonitor} (83%)
mode change 100755 => 100644
copy systemvm/debian/opt/cloud/bin/{cs_monitorservice.py => getRouterMonitorResults.sh} (51%)
copy systemvm/debian/{opt/cloud/bin/cs_monitorservice.py => root/health_checks/__init__.py} (83%)
mode change 100755 => 100644
create mode 100644 systemvm/debian/root/health_checks/cpu_usage_check.py
create mode 100755 systemvm/debian/root/health_checks/dhcp_check.py
create mode 100644 systemvm/debian/root/health_checks/disk_space_check.py
create mode 100644 systemvm/debian/root/health_checks/dns_check.py
create mode 100644 systemvm/debian/root/health_checks/gateways_check.py
create mode 100644 systemvm/debian/root/health_checks/haproxy_check.py
create mode 100644 systemvm/debian/root/health_checks/iptables_check.py
create mode 100644 systemvm/debian/root/health_checks/memory_usage_check.py
create mode 100644 systemvm/debian/root/health_checks/router_version_check.py
copy systemvm/debian/{opt/cloud/bin/cs_monitorservice.py => root/health_checks/utility/__init__.py} (85%)
mode change 100755 => 100644
create mode 100644 systemvm/debian/root/health_checks/utility/sharedFunctions.py