Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 08:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make it possible to turn the Prometheus exporter on and off

Browse source 
The settings are available from the domain settings page.
This commit is contained in:
Dale Glass 2020-04-10 17:01:40 +02:00
parent a8bd627cda
commit 443d769eac
4 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
domain-server/resources/describe-settings.json
View file

@ -57,6 +57,29 @@
}
]
},
{
"label": "Monitoring",
"name": "monitoring",
"restart": false,
"settings": [
{
"name": "enable_prometheus_exporter",
"label": "Enable Prometheus Exporter",
"help": "Enable a Prometheus exporter to make it possible to gather the stats that are available at <a href='/'>Nodes</a> tab with a <a href='https://prometheus.io/'>Prometheus</a> server. This makes it possible to keep track of long-term domain statistics for graphing, troubleshooting, and performance monitoring.",
"default": false,
"type": "checkbox",
"advanced": true
},
{
"name": "prometheus_exporter_port",
"label": "Prometheus TCP Port",
"help": "This is the port where the Prometheus exporter accepts connections. It listens both on IPv4 and IPv6 and can be accessed remotely, so you should make sure to restrict access with a firewall as needed.",
"default": "9703",
"type": "int",
"advanced": true
}
]
},
{
"label": "Paths",
"html_id": "paths",

32
domain-server/src/DomainServer.cpp
View file

@ -163,8 +163,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
DomainServer::DomainServer(int argc, char* argv[]) :
QCoreApplication(argc, argv),
_gatekeeper(this),
_httpManager(QHostAddress::AnyIPv4, DOMAIN_SERVER_HTTP_PORT, QString("%1/resources/web/").arg(QCoreApplication::applicationDirPath()), this),
_httpExporterManager(QHostAddress::Any, DOMAIN_SERVER_EXPORTER_PORT, QString("%1/resources/prometheus_exporter/").arg(QCoreApplication::applicationDirPath()), &_exporter)
_httpManager(QHostAddress::AnyIPv4, DOMAIN_SERVER_HTTP_PORT, QString("%1/resources/web/").arg(QCoreApplication::applicationDirPath()), this)
{
if (_parentPID != -1) {
watchParentProcess(_parentPID);
@ -230,7 +229,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
this, &DomainServer::updateDownstreamNodes);
connect(&_settingsManager, &DomainServerSettingsManager::settingsUpdated,
this, &DomainServer::updateUpstreamNodes);
setupGroupCacheRefresh();
optionallySetupOAuth();
@ -331,6 +329,8 @@ DomainServer::DomainServer(int argc, char* argv[]) :
_nodePingMonitorTimer = new QTimer{ this };
connect(_nodePingMonitorTimer, &QTimer::timeout, this, &DomainServer::nodePingMonitor);
_nodePingMonitorTimer->start(NODE_PING_MONITOR_INTERVAL_MSECS);
initializeExporter();
}
void DomainServer::parseCommandLine(int argc, char* argv[]) {
@ -425,6 +425,11 @@ DomainServer::~DomainServer() {
_contentManager->terminate();
}
if ( _httpExporterManager ) {
_httpExporterManager->close();
delete _httpExporterManager;
}
DependencyManager::destroy<AccountManager>();
// cleanup the AssetClient thread
@ -3039,6 +3044,27 @@ void DomainServer::updateUpstreamNodes() {
updateReplicationNodes(Upstream);
}
void DomainServer::initializeExporter()
{
static const QString ENABLE_EXPORTER = "monitoring.enable_prometheus_exporter";
static const QString EXPORTER_PORT = "monitoring.prometheus_exporter_port";
bool isExporterEnabled = _settingsManager.valueOrDefaultValueForKeyPath(ENABLE_EXPORTER).toBool();
int exporterPort = _settingsManager.valueOrDefaultValueForKeyPath(EXPORTER_PORT).toInt();
if ( exporterPort < 1 || exporterPort > 65535 ) {
qCWarning(domain_server) << "Prometheus exporter port " << exporterPort << " is out of range.";
isExporterEnabled = false;
}
qCDebug(domain_server) << "Setting up Prometheus exporter";
if ( isExporterEnabled && !_httpExporterManager) {
qCInfo(domain_server) << "Starting Prometheus exporter on port " << exporterPort;
_httpExporterManager = new HTTPManager(QHostAddress::Any, static_cast<quint16>(exporterPort), QString("%1/resources/prometheus_exporter/").arg(QCoreApplication::applicationDirPath()), &_exporter);
}
}
void DomainServer::updateReplicatedNodes() {
// Make sure we have downstream nodes in our list
static const QString REPLICATED_USERS_KEY = "users";

3
domain-server/src/DomainServer.h
View file

@ -139,6 +139,7 @@ private slots:
void updateReplicatedNodes();
void updateDownstreamNodes();
void updateUpstreamNodes();
void initializeExporter();
void tokenGrantFinished();
void profileRequestFinished();
@ -238,7 +239,7 @@ private:
DomainServerExporter _exporter;
HTTPManager _httpManager;
HTTPManager _httpExporterManager;
HTTPManager *_httpExporterManager { nullptr };
std::unique_ptr<HTTPSManager> _httpsManager;
QHash<QUuid, SharedAssignmentPointer> _allAssignments;

2
libraries/embedded-webserver/src/HTTPManager.h
View file

@ -34,7 +34,7 @@ class HTTPManager : public QTcpServer, public HTTPRequestHandler {
public:
/// Initializes the manager.
HTTPManager(const QHostAddress& listenAddress, quint16 port, const QString& documentRoot, HTTPRequestHandler* requestHandler = nullptr);
bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false) override;
private slots: