Ydb stable 22-4-2122.4.21

x-stable-origin-commit: e89099581237299a132feafb5b58af59ebd0468a

9 files changed, 53 insertions, 17 deletions

diff --git a/library/cpp/monlib/CMakeLists.txt b/library/cpp/monlib/CMakeLists.txt
new file mode 100644
index 0000000000..f618762aa8
--- /dev/null
+++ b/library/cpp/monlib/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(deprecated)
+add_subdirectory(dynamic_counters)
+add_subdirectory(encode)
+add_subdirectory(exception)
+add_subdirectory(messagebus)
+add_subdirectory(metrics)
+add_subdirectory(service)
diff --git a/library/cpp/monlib/deprecated/CMakeLists.txt b/library/cpp/monlib/deprecated/CMakeLists.txt
new file mode 100644
index 0000000000..b413e0df87
--- /dev/null
+++ b/library/cpp/monlib/deprecated/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(json)
diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.txt
index e7bd3b4597..e8dacd3a61 100644
--- a/library/cpp/monlib/dynamic_counters/CMakeLists.txt
+++ b/library/cpp/monlib/dynamic_counters/CMakeLists.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(percentile)
 
 add_library(cpp-monlib-dynamic_counters)
 target_link_libraries(cpp-monlib-dynamic_counters PUBLIC
diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/library/cpp/monlib/dynamic_counters/page.cpp
index b116adfdef..223a4448a8 100644
--- a/library/cpp/monlib/dynamic_counters/page.cpp
+++ b/library/cpp/monlib/dynamic_counters/page.cpp
@@ -123,7 +123,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             out << " for <a href='https://wiki.yandex-team.ru/solomon/'>Solomon</a>";
         }
 
-        H5() {
+        TAG(TH5) {
             out << "Counters subgroups";
         }
         UL() {
@@ -136,7 +136,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             });
         }
 
-        H4() {
+        TAG(TH4) {
             out << "Counters as text";
         }
     }
diff --git a/library/cpp/monlib/encode/CMakeLists.txt b/library/cpp/monlib/encode/CMakeLists.txt
index c00a5530e3..539c9b07f3 100644
--- a/library/cpp/monlib/encode/CMakeLists.txt
+++ b/library/cpp/monlib/encode/CMakeLists.txt
@@ -6,6 +6,12 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(buffered)
+add_subdirectory(json)
+add_subdirectory(legacy_protobuf)
+add_subdirectory(prometheus)
+add_subdirectory(spack)
+add_subdirectory(text)
 
 add_library(cpp-monlib-encode)
 target_link_libraries(cpp-monlib-encode PUBLIC
diff --git a/library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt b/library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt
new file mode 100644
index 0000000000..dde515d0db
--- /dev/null
+++ b/library/cpp/monlib/encode/legacy_protobuf/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(protos)
diff --git a/library/cpp/monlib/service/CMakeLists.txt b/library/cpp/monlib/service/CMakeLists.txt
index db4bf963ff..24bc76ad29 100644
--- a/library/cpp/monlib/service/CMakeLists.txt
+++ b/library/cpp/monlib/service/CMakeLists.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(pages)
 
 add_library(cpp-monlib-service)
 target_link_libraries(cpp-monlib-service PUBLIC
diff --git a/library/cpp/monlib/service/pages/CMakeLists.txt b/library/cpp/monlib/service/pages/CMakeLists.txt
index 36b85fd379..cc2387ede1 100644
--- a/library/cpp/monlib/service/pages/CMakeLists.txt
+++ b/library/cpp/monlib/service/pages/CMakeLists.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(tablesorter)
 
 add_library(monlib-service-pages)
 target_link_libraries(monlib-service-pages PUBLIC
diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h
index b4656f059f..ab1d91c54e 100644
--- a/library/cpp/monlib/service/pages/templates.h
+++ b/library/cpp/monlib/service/pages/templates.h
@@ -13,14 +13,14 @@
     label                                \
         :
 
-#define TAG(name) WITH_SCOPED(tmp, NMonitoring::name(__stream))
-#define TAG_CLASS(name, cls) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls))
-#define TAG_CLASS_STYLE(name, cls, style) WITH_SCOPED(tmp, NMonitoring::name(__stream, {{"class", cls}, {"style", style}}))
-#define TAG_CLASS_ID(name, cls, id) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls, "", id))
-#define TAG_CLASS_FOR(name, cls, for0) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls, for0))
-#define TAG_ATTRS(name, ...) WITH_SCOPED(tmp, NMonitoring::name(__stream, ##__VA_ARGS__))
+#define TAG(name) WITH_SCOPED(tmp, ::NMonitoring::name(__stream))
+#define TAG_CLASS(name, cls) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls))
+#define TAG_CLASS_STYLE(name, cls, style) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, {{"class", cls}, {"style", style}}))
+#define TAG_CLASS_ID(name, cls, id) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls, "", id))
+#define TAG_CLASS_FOR(name, cls, for0) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls, for0))
+#define TAG_ATTRS(name, ...) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, ##__VA_ARGS__))
 
-#define HTML(str) WITH_SCOPED(__stream, NMonitoring::TOutputStreamRef(str))
+#define HTML(str) WITH_SCOPED(__stream, ::NMonitoring::TOutputStreamRef(str))
 
 #define HEAD() TAG(THead)
 #define BODY() TAG(TBody)
@@ -55,17 +55,11 @@
 #define PARA() TAG(TPara)
 #define PARA_CLASS(cls) TAG_CLASS(TPara, cls)
 
-#define H1() TAG(TH1)
 #define H1_CLASS(cls) TAG_CLASS(TH1, cls)
-#define H2() TAG(TH2)
 #define H2_CLASS(cls) TAG_CLASS(TH2, cls)
-#define H3() TAG(TH3)
 #define H3_CLASS(cls) TAG_CLASS(TH3, cls)
-#define H4() TAG(TH4)
 #define H4_CLASS(cls) TAG_CLASS(TH4, cls)
-#define H5() TAG(TH5)
 #define H5_CLASS(cls) TAG_CLASS(TH5, cls)
-#define H6() TAG(TH6)
 #define H6_CLASS(cls) TAG_CLASS(TH6, cls)
 
 #define SMALL() TAG(TSMALL)
@@ -92,10 +86,10 @@
 #define HTML_OUTPUT_TIME_PARAM(str, param) str << #param << ": " << ToStringLocalTimeUpToSeconds(param) << "<br/>"
 
 #define COLLAPSED_BUTTON_CONTENT(targetId, buttonText) \
-    WITH_SCOPED(tmp, NMonitoring::TCollapsedButton(__stream, targetId, buttonText))
+    WITH_SCOPED(tmp, ::NMonitoring::TCollapsedButton(__stream, targetId, buttonText))
 
 #define HREF(path) \
-    WITH_SCOPED(tmp, NMonitoring::THref(__stream, path))
+    WITH_SCOPED(tmp, ::NMonitoring::THref(__stream, path))
 
 namespace NMonitoring {
     struct THref {