diff options
author | msherbakov <msherbakov@yandex-team.ru> | 2022-02-10 16:49:17 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:17 +0300 |
commit | a0ffafe83b7d6229709a32fa942c71d672ac989c (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/monlib/service/pages | |
parent | c224a621661ddd69699f9476922eb316607ef57e (diff) | |
download | ydb-a0ffafe83b7d6229709a32fa942c71d672ac989c.tar.gz |
Restoring authorship annotation for <msherbakov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/monlib/service/pages')
17 files changed, 127 insertions, 127 deletions
diff --git a/library/cpp/monlib/service/pages/diag_mon_page.cpp b/library/cpp/monlib/service/pages/diag_mon_page.cpp index a3b5292e56..2493ff4fba 100644 --- a/library/cpp/monlib/service/pages/diag_mon_page.cpp +++ b/library/cpp/monlib/service/pages/diag_mon_page.cpp @@ -2,8 +2,8 @@ using namespace NMonitoring; -void TDiagMonPage::OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest& request) { - out << "uri: " << request.GetUri() << "\n"; - out << "path: " << request.GetPath() << "\n"; - out << "path info: " << request.GetPathInfo() << "\n"; +void TDiagMonPage::OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest& request) { + out << "uri: " << request.GetUri() << "\n"; + out << "path: " << request.GetPath() << "\n"; + out << "path info: " << request.GetPathInfo() << "\n"; } diff --git a/library/cpp/monlib/service/pages/diag_mon_page.h b/library/cpp/monlib/service/pages/diag_mon_page.h index a0eb154ba5..761194d4ec 100644 --- a/library/cpp/monlib/service/pages/diag_mon_page.h +++ b/library/cpp/monlib/service/pages/diag_mon_page.h @@ -10,7 +10,7 @@ namespace NMonitoring { { } - void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override; + void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override; }; } diff --git a/library/cpp/monlib/service/pages/html_mon_page.cpp b/library/cpp/monlib/service/pages/html_mon_page.cpp index f37d0a961b..eb4eb3b66c 100644 --- a/library/cpp/monlib/service/pages/html_mon_page.cpp +++ b/library/cpp/monlib/service/pages/html_mon_page.cpp @@ -4,8 +4,8 @@ using namespace NMonitoring; -void THtmlMonPage::Output(NMonitoring::IMonHttpRequest& request) { - IOutputStream& out = request.Output(); +void THtmlMonPage::Output(NMonitoring::IMonHttpRequest& request) { + IOutputStream& out = request.Output(); out << HTTPOKHTML; HTML(out) { @@ -47,14 +47,14 @@ void THtmlMonPage::Output(NMonitoring::IMonHttpRequest& request) { } } -void THtmlMonPage::NotFound(NMonitoring::IMonHttpRequest& request) const { - IOutputStream& out = request.Output(); +void THtmlMonPage::NotFound(NMonitoring::IMonHttpRequest& request) const { + IOutputStream& out = request.Output(); out << HTTPNOTFOUND; out.Flush(); } - -void THtmlMonPage::NoContent(NMonitoring::IMonHttpRequest& request) const { - IOutputStream& out = request.Output(); - out << HTTPNOCONTENT; - out.Flush(); -} + +void THtmlMonPage::NoContent(NMonitoring::IMonHttpRequest& request) const { + IOutputStream& out = request.Output(); + out << HTTPNOCONTENT; + out.Flush(); +} diff --git a/library/cpp/monlib/service/pages/html_mon_page.h b/library/cpp/monlib/service/pages/html_mon_page.h index a7d45f50c9..e87c53b62b 100644 --- a/library/cpp/monlib/service/pages/html_mon_page.h +++ b/library/cpp/monlib/service/pages/html_mon_page.h @@ -12,12 +12,12 @@ namespace NMonitoring { { } - void Output(NMonitoring::IMonHttpRequest& request) override; + void Output(NMonitoring::IMonHttpRequest& request) override; - void NotFound(NMonitoring::IMonHttpRequest& request) const; - void NoContent(NMonitoring::IMonHttpRequest& request) const; + void NotFound(NMonitoring::IMonHttpRequest& request) const; + void NoContent(NMonitoring::IMonHttpRequest& request) const; - virtual void OutputContent(NMonitoring::IMonHttpRequest& request) = 0; + virtual void OutputContent(NMonitoring::IMonHttpRequest& request) = 0; bool OutputTableSorterJsCss; }; diff --git a/library/cpp/monlib/service/pages/index_mon_page.cpp b/library/cpp/monlib/service/pages/index_mon_page.cpp index f91591ebad..83ff8b529a 100644 --- a/library/cpp/monlib/service/pages/index_mon_page.cpp +++ b/library/cpp/monlib/service/pages/index_mon_page.cpp @@ -5,33 +5,33 @@ using namespace NMonitoring; -void TIndexMonPage::OutputIndexPage(IMonHttpRequest& request) { - request.Output() << HTTPOKHTML; - request.Output() << "<html>\n"; - OutputHead(request.Output()); +void TIndexMonPage::OutputIndexPage(IMonHttpRequest& request) { + request.Output() << HTTPOKHTML; + request.Output() << "<html>\n"; + OutputHead(request.Output()); OutputBody(request); - request.Output() << "</html>\n"; + request.Output() << "</html>\n"; } -void TIndexMonPage::Output(IMonHttpRequest& request) { - TStringBuf pathInfo = request.GetPathInfo(); +void TIndexMonPage::Output(IMonHttpRequest& request) { + TStringBuf pathInfo = request.GetPathInfo(); if (pathInfo.empty() || pathInfo == TStringBuf("/")) { OutputIndexPage(request); return; } - Y_VERIFY(pathInfo.StartsWith('/')); + Y_VERIFY(pathInfo.StartsWith('/')); TMonPagePtr found; // analogous to CGI PATH_INFO { TGuard<TMutex> g(Mtx); - TStringBuf pathTmp = request.GetPathInfo(); + TStringBuf pathTmp = request.GetPathInfo(); for (;;) { TPagesByPath::iterator i = PagesByPath.find(pathTmp); if (i != PagesByPath.end()) { found = i->second; - pathInfo = request.GetPathInfo().substr(pathTmp.size()); + pathInfo = request.GetPathInfo().substr(pathTmp.size()); Y_VERIFY(pathInfo.empty() || pathInfo.StartsWith('/')); break; } @@ -43,11 +43,11 @@ void TIndexMonPage::Output(IMonHttpRequest& request) { } } } - if (found) { + if (found) { THolder<IMonHttpRequest> child(request.MakeChild(found.Get(), TString{pathInfo})); - found->Output(*child); + found->Output(*child); } else { - request.Output() << HTTPNOTFOUND; + request.Output() << HTTPNOTFOUND; } } @@ -123,17 +123,17 @@ void TIndexMonPage::OutputHead(IOutputStream& out) { out << "</head>\n"; } -void TIndexMonPage::OutputBody(IMonHttpRequest& req) { - auto& out = req.Output(); - out << "<body>\n"; +void TIndexMonPage::OutputBody(IMonHttpRequest& req) { + auto& out = req.Output(); + out << "<body>\n"; // part of common navbar OutputNavBar(out); - out << "<div class='container'>\n" + out << "<div class='container'>\n" << "<h2>" << Title << "</h2>\n"; - OutputIndex(out, req.GetPathInfo().EndsWith('/')); - out << "<div>\n" + OutputIndex(out, req.GetPathInfo().EndsWith('/')); + out << "<div>\n" << "</body>\n"; } diff --git a/library/cpp/monlib/service/pages/index_mon_page.h b/library/cpp/monlib/service/pages/index_mon_page.h index c491b76557..bf514a3105 100644 --- a/library/cpp/monlib/service/pages/index_mon_page.h +++ b/library/cpp/monlib/service/pages/index_mon_page.h @@ -18,12 +18,12 @@ namespace NMonitoring { ~TIndexMonPage() override { } - void Output(IMonHttpRequest& request) override; - void OutputIndexPage(IMonHttpRequest& request); + void Output(IMonHttpRequest& request) override; + void OutputIndexPage(IMonHttpRequest& request); virtual void OutputIndex(IOutputStream& out, bool pathEndsWithSlash); virtual void OutputCommonJsCss(IOutputStream& out); void OutputHead(IOutputStream& out); - void OutputBody(IMonHttpRequest& out); + void OutputBody(IMonHttpRequest& out); void Register(TMonPagePtr page); TIndexMonPage* RegisterIndexPage(const TString& path, const TString& title); diff --git a/library/cpp/monlib/service/pages/mon_page.h b/library/cpp/monlib/service/pages/mon_page.h index b3d2635997..e396612bb0 100644 --- a/library/cpp/monlib/service/pages/mon_page.h +++ b/library/cpp/monlib/service/pages/mon_page.h @@ -17,8 +17,8 @@ namespace NMonitoring { static const char HTTPOKCSS[] = "HTTP/1.1 200 Ok\r\nContent-Type: text/css\r\nConnection: Close\r\n\r\n"; static const char HTTPNOCONTENT[] = "HTTP/1.1 204 No content\r\nConnection: Close\r\n\r\n"; static const char HTTPNOTFOUND[] = "HTTP/1.1 404 Invalid URI\r\nConnection: Close\r\n\r\nInvalid URL\r\n"; - static const char HTTPUNAUTHORIZED[] = "HTTP/1.1 401 Unauthorized\r\nConnection: Close\r\n\r\nUnauthorized\r\n"; - static const char HTTPFORBIDDEN[] = "HTTP/1.1 403 Forbidden\r\nConnection: Close\r\n\r\nForbidden\r\n"; + static const char HTTPUNAUTHORIZED[] = "HTTP/1.1 401 Unauthorized\r\nConnection: Close\r\n\r\nUnauthorized\r\n"; + static const char HTTPFORBIDDEN[] = "HTTP/1.1 403 Forbidden\r\nConnection: Close\r\n\r\nForbidden\r\n"; // Fonts static const char HTTPOKFONTEOT[] = "HTTP/1.1 200 Ok\r\nContent-Type: application/vnd.ms-fontobject\r\nConnection: Close\r\n\r\n"; @@ -60,7 +60,7 @@ namespace NMonitoring { return !Title.empty(); } - virtual void Output(IMonHttpRequest& request) = 0; + virtual void Output(IMonHttpRequest& request) = 0; }; } diff --git a/library/cpp/monlib/service/pages/pre_mon_page.cpp b/library/cpp/monlib/service/pages/pre_mon_page.cpp index fcec142b09..fc03a19b80 100644 --- a/library/cpp/monlib/service/pages/pre_mon_page.cpp +++ b/library/cpp/monlib/service/pages/pre_mon_page.cpp @@ -2,17 +2,17 @@ using namespace NMonitoring; -void TPreMonPage::OutputContent(NMonitoring::IMonHttpRequest& request) { - auto& out = request.Output(); +void TPreMonPage::OutputContent(NMonitoring::IMonHttpRequest& request) { + auto& out = request.Output(); if (PreTag) { BeforePre(request); - out << "<pre>\n"; - OutputText(out, request); - out << "</pre>\n"; + out << "<pre>\n"; + OutputText(out, request); + out << "</pre>\n"; } else { - OutputText(out, request); + OutputText(out, request); } } -void TPreMonPage::BeforePre(NMonitoring::IMonHttpRequest&) { +void TPreMonPage::BeforePre(NMonitoring::IMonHttpRequest&) { } diff --git a/library/cpp/monlib/service/pages/pre_mon_page.h b/library/cpp/monlib/service/pages/pre_mon_page.h index 66a9fe494d..c9a923d39a 100644 --- a/library/cpp/monlib/service/pages/pre_mon_page.h +++ b/library/cpp/monlib/service/pages/pre_mon_page.h @@ -13,13 +13,13 @@ namespace NMonitoring { { } - void OutputContent(NMonitoring::IMonHttpRequest& request) override; + void OutputContent(NMonitoring::IMonHttpRequest& request) override; // hook to customize output - virtual void BeforePre(NMonitoring::IMonHttpRequest& request); + virtual void BeforePre(NMonitoring::IMonHttpRequest& request); // put your text here - virtual void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) = 0; + virtual void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) = 0; const bool PreTag; }; diff --git a/library/cpp/monlib/service/pages/registry_mon_page.cpp b/library/cpp/monlib/service/pages/registry_mon_page.cpp index c47668391f..c59e50f622 100644 --- a/library/cpp/monlib/service/pages/registry_mon_page.cpp +++ b/library/cpp/monlib/service/pages/registry_mon_page.cpp @@ -1,46 +1,46 @@ -#include "registry_mon_page.h" - +#include "registry_mon_page.h" + #include <library/cpp/monlib/encode/text/text.h> #include <library/cpp/monlib/encode/json/json.h> #include <library/cpp/monlib/encode/prometheus/prometheus.h> #include <library/cpp/monlib/encode/spack/spack_v1.h> #include <library/cpp/monlib/service/format.h> - -namespace NMonitoring { + +namespace NMonitoring { void TMetricRegistryPage::Output(NMonitoring::IMonHttpRequest& request) { - const auto formatStr = TStringBuf{request.GetPathInfo()}.RNextTok('/'); - auto& out = request.Output(); - + const auto formatStr = TStringBuf{request.GetPathInfo()}.RNextTok('/'); + auto& out = request.Output(); + if (!formatStr.empty()) { IMetricEncoderPtr encoder; - TString resp; - + TString resp; + if (formatStr == TStringBuf("json")) { - resp = HTTPOKJSON; - encoder = NMonitoring::EncoderJson(&out); + resp = HTTPOKJSON; + encoder = NMonitoring::EncoderJson(&out); } else if (formatStr == TStringBuf("spack")) { - resp = HTTPOKSPACK; + resp = HTTPOKSPACK; const auto compression = ParseCompression(request); encoder = NMonitoring::EncoderSpackV1(&out, ETimePrecision::SECONDS, compression); } else if (formatStr == TStringBuf("prometheus")) { resp = HTTPOKPROMETHEUS; encoder = NMonitoring::EncoderPrometheus(&out); - } else { + } else { ythrow yexception() << "unsupported metric encoding format: " << formatStr; - } - - out.Write(resp); + } + + out.Write(resp); RegistryRawPtr_->Accept(TInstant::Zero(), encoder.Get()); encoder->Close(); - } else { - THtmlMonPage::Output(request); - } - } - + } else { + THtmlMonPage::Output(request); + } + } + void TMetricRegistryPage::OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) { IMetricEncoderPtr encoder = NMonitoring::EncoderText(&out); RegistryRawPtr_->Accept(TInstant::Zero(), encoder.Get()); - } - -} + } + +} diff --git a/library/cpp/monlib/service/pages/registry_mon_page.h b/library/cpp/monlib/service/pages/registry_mon_page.h index f23ab69232..2d26d3319c 100644 --- a/library/cpp/monlib/service/pages/registry_mon_page.h +++ b/library/cpp/monlib/service/pages/registry_mon_page.h @@ -1,32 +1,32 @@ -#pragma once - -#include "pre_mon_page.h" - +#pragma once + +#include "pre_mon_page.h" + #include <library/cpp/monlib/metrics/metric_registry.h> - -namespace NMonitoring { + +namespace NMonitoring { // For now this class can only enumerate all metrics without any grouping or serve JSON/Spack/Prometheus class TMetricRegistryPage: public TPreMonPage { - public: + public: TMetricRegistryPage(const TString& path, const TString& title, TAtomicSharedPtr<IMetricSupplier> registry) - : TPreMonPage(path, title) + : TPreMonPage(path, title) , Registry_(registry) , RegistryRawPtr_(Registry_.Get()) - { - } - + { + } + TMetricRegistryPage(const TString& path, const TString& title, IMetricSupplier* registry) : TPreMonPage(path, title) , RegistryRawPtr_(registry) { } - void Output(NMonitoring::IMonHttpRequest& request) override; - void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override; - - private: + void Output(NMonitoring::IMonHttpRequest& request) override; + void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override; + + private: TAtomicSharedPtr<IMetricSupplier> Registry_; IMetricSupplier* RegistryRawPtr_; - }; - -} + }; + +} diff --git a/library/cpp/monlib/service/pages/resource_mon_page.cpp b/library/cpp/monlib/service/pages/resource_mon_page.cpp index 16b1eb1aa0..ec4ac6a1a7 100644 --- a/library/cpp/monlib/service/pages/resource_mon_page.cpp +++ b/library/cpp/monlib/service/pages/resource_mon_page.cpp @@ -2,8 +2,8 @@ using namespace NMonitoring; -void TResourceMonPage::Output(NMonitoring::IMonHttpRequest& request) { - IOutputStream& out = request.Output(); +void TResourceMonPage::Output(NMonitoring::IMonHttpRequest& request) { + IOutputStream& out = request.Output(); switch (ResourceType) { case TEXT: out << HTTPOKTEXT; @@ -42,8 +42,8 @@ void TResourceMonPage::Output(NMonitoring::IMonHttpRequest& request) { out << NResource::Find(ResourceName); } -void TResourceMonPage::NotFound(NMonitoring::IMonHttpRequest& request) const { - IOutputStream& out = request.Output(); +void TResourceMonPage::NotFound(NMonitoring::IMonHttpRequest& request) const { + IOutputStream& out = request.Output(); out << HTTPNOTFOUND; out.Flush(); } diff --git a/library/cpp/monlib/service/pages/resource_mon_page.h b/library/cpp/monlib/service/pages/resource_mon_page.h index ec00e8ccc4..f6ab67200e 100644 --- a/library/cpp/monlib/service/pages/resource_mon_page.h +++ b/library/cpp/monlib/service/pages/resource_mon_page.h @@ -31,9 +31,9 @@ namespace NMonitoring { { } - void Output(NMonitoring::IMonHttpRequest& request) override; + void Output(NMonitoring::IMonHttpRequest& request) override; - void NotFound(NMonitoring::IMonHttpRequest& request) const; + void NotFound(NMonitoring::IMonHttpRequest& request) const; private: TString ResourceName; diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h index eac97955a2..b4656f059f 100644 --- a/library/cpp/monlib/service/pages/templates.h +++ b/library/cpp/monlib/service/pages/templates.h @@ -94,28 +94,28 @@ #define COLLAPSED_BUTTON_CONTENT(targetId, buttonText) \ WITH_SCOPED(tmp, NMonitoring::TCollapsedButton(__stream, targetId, buttonText)) -#define HREF(path) \ - WITH_SCOPED(tmp, NMonitoring::THref(__stream, path)) - +#define HREF(path) \ + WITH_SCOPED(tmp, NMonitoring::THref(__stream, path)) + namespace NMonitoring { - struct THref { - THref(IOutputStream& str, TStringBuf path) - : Str(str) - { - Str << "<a href="<< path << '>'; - } - - ~THref() { - Str << "</a>"; - } - - explicit inline operator bool() const noexcept { - return true; // just to work with WITH_SCOPED - } - - IOutputStream& Str; - }; - + struct THref { + THref(IOutputStream& str, TStringBuf path) + : Str(str) + { + Str << "<a href="<< path << '>'; + } + + ~THref() { + Str << "</a>"; + } + + explicit inline operator bool() const noexcept { + return true; // just to work with WITH_SCOPED + } + + IOutputStream& Str; + }; + template <const char* tag> struct TTag { TTag(IOutputStream& str, TStringBuf cls = "", TStringBuf for0 = "", TStringBuf id = "") diff --git a/library/cpp/monlib/service/pages/version_mon_page.cpp b/library/cpp/monlib/service/pages/version_mon_page.cpp index 0031031815..41e29417da 100644 --- a/library/cpp/monlib/service/pages/version_mon_page.cpp +++ b/library/cpp/monlib/service/pages/version_mon_page.cpp @@ -6,7 +6,7 @@ using namespace NMonitoring; -void TVersionMonPage::OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) { +void TVersionMonPage::OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) { const char* version = GetProgramSvnVersion(); out << version; if (!TString(version).EndsWith("\n")) diff --git a/library/cpp/monlib/service/pages/version_mon_page.h b/library/cpp/monlib/service/pages/version_mon_page.h index c559e5940d..f7649947e4 100644 --- a/library/cpp/monlib/service/pages/version_mon_page.h +++ b/library/cpp/monlib/service/pages/version_mon_page.h @@ -9,7 +9,7 @@ namespace NMonitoring { { } - void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override; + void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override; }; } diff --git a/library/cpp/monlib/service/pages/ya.make b/library/cpp/monlib/service/pages/ya.make index 6c656748ce..48d44a0838 100644 --- a/library/cpp/monlib/service/pages/ya.make +++ b/library/cpp/monlib/service/pages/ya.make @@ -1,6 +1,6 @@ LIBRARY() -OWNER(g:solomon) +OWNER(g:solomon) NO_WSHADOW() @@ -13,7 +13,7 @@ SRCS( resource_mon_page.cpp templates.cpp version_mon_page.cpp - registry_mon_page.cpp + registry_mon_page.cpp ) PEERDIR( |