8000 properly name metrics (#11771) · thedemodev/arangodb@d4bb467 · GitHub
[go: up one dir, main page]
Skip to content

Commit d4bb467

Browse files
jsteemannjsteemann
authored
properly name metrics (arangodb#11771)
1 parent 5d3d472 commit d4bb467

File tree

3 files changed

+45
-45
lines changed

3 files changed

+45
-45
lines changed

‎arangod/Agency/Constituent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Constituent::Constituent(application_features::ApplicationServer& server)
7777
_queryRegistry(nullptr),
7878
_term(0),
7979
_gterm(_server.getFeature<arangodb::MetricsFeature>().gauge(
80-
"agency_term", _term, "Agency's term")),
80+
"arangodb_agency_term", _term, "Agency's term")),
8181
_leaderID(NO_LEADER),
8282
_lastHeartbeatSeen(0.0),
8383
_role(FOLLOWER),

‎arangod/Cluster/ClusterInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@ ClusterInfo::ClusterInfo(application_features::ApplicationServer& server,
262262
_planLoader(std::thread::id()),
263263
_uniqid(),
264264
_lpTimer(_server.getFeature<MetricsFeature>().histogram(
265-
"load_plan_runtime", log_scale_t(std::exp(1.f), 0.f, 2500.f, 10),
265+
"arangodb_load_plan_runtime", log_scale_t(std::exp(1.f), 0.f, 2500.f, 10),
266266
"Plan loading runtimes [ms]")),
267267
_lcTimer(_server.getFeature<MetricsFeature>().histogram(
268-
"load_current_runtime", log_scale_t(std::exp(1.f), 0.f, 2500.f, 10),
268+
"arangodb_load_current_runtime", log_scale_t(std::exp(1.f), 0.f, 2500.f, 10),
269269
"Current loading runtimes [ms]")) {
270270
_uniqid._currentValue = 1ULL;
271271
_uniqid._upperValue = 0ULL;

‎arangod/Statistics/StatisticsWorker.cpp

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -821,130 +821,130 @@ std::string const HELP_("\n#HELP ");
821821
std::map<std::string, std::vector<std::string>> statStrings{
822822
{"bytesReceived",
823823
{"arangodb_client_connection_statistics_bytes_received_bucket", "gauge",
824-
"Bytes received for a request.\n"}},
824+
"Bytes received for a request\n"}},
825825
{"bytesReceivedCount",
826826
{"arangodb_client_connection_statistics_bytes_received_count", "gauge",
827-
"Bytes received for a request.\n"}},
827+
"Bytes received for a request\n"}},
828828
{"bytesReceivedSum",
829829
{"arangodb_client_connection_statistics_bytes_received_sum", "gauge",
830-
"Bytes received for a request.\n"}},
830+
"Bytes received for a request\n"}},
831831
{"bytesSent",
832832
{"arangodb_client_connection_statistics_bytes_sent_bucket", "gauge",
833-
"Bytes sent for a request.\n"}},
833+
"Bytes sent for a request\n"}},
834834
{"bytesSentCount",
835835
{"arangodb_client_connection_statistics_bytes_sent_count", "gauge",
836-
"Bytes sent for a request.\n"}},
836+
"Bytes sent for a request\n"}},
837837
{"bytesSentSum",
838838
{"arangodb_client_connection_statistics_bytes_sent_sum", "gauge",
839-
"Bytes sent for a request.\n"}},
839+
"Bytes sent for a request\n"}},
840840
{"minorPageFaults",
841841
{"arangodb_process_statistics_minor_page_faults", "gauge",
842-
"The number of minor faults the process has made which have not required loading a memory page from disk. This figure is not reported on Windows.\n"}},
842+
"The number of minor faults the process has made which have not required loading a memory page from disk. This figure is not reported on Windows\n"}},
843843
{"majorPageFaults",
844844
{"arangodb_process_statistics_major_page_faults", "gauge",
845-
"On Windows, this figure contains the total number of page faults. On other system, this figure contains the number of major faults the process has made which have required loading a memory page from disk.\n"}},
845+
"On Windows, this figure contains the total number of page faults. On other system, this figure contains the number of major faults the process has made which have required loading a memory page from disk\n"}},
846846
{"bytesReceived",
847847
{"arangodb_client_connection_statistics_bytes_received_bucket", "gauge",
848848
"Bytes received for a request"}},
849849
{"userTime",
850850
{"arangodb_process_statistics_user_time", "gauge",
851-
"On Windows, this figure contains the total amount of memory that the memory manager has committed for the arangod process. On other systems, this figure contains The size of the virtual memory the process is using.\n"}},
851+
"On Windows, this figure contains the total amount of memory that the memory manager has committed for the arangod process. On other systems, this figure contains The size of the virtual memory the process is using\n"}},
852852
{"systemTime",
853853
{"arangodb_process_statistics_system_time", "gauge",
854-
"Amount of time that this process has been scheduled in kernel mode, measured in seconds.\n"}},
854+
"Amount of time that this process has been scheduled in kernel mode, measured in seconds\n"}},
855855
{"numberOfThreads",
856856
{"arangodb_process_statistics_number_of_threads", "gauge",
857-
"Number of threads in the arangod process.\n"}},
857+
"Number of threads in the arangod process\n"}},
858858
{"residentSize",
859-
{"arangodb_process_statistics_resident_set_size", "gauge", "The total size of the number of pages the process has in real memory. This is just the pages which count toward text, data, or stack space. This does not include pages which have not been demand-loaded in, or which are swapped out. The resident set size is reported in bytes.\n"}},
859+
{"arangodb_process_statistics_resident_set_size", "gauge", "The total size of the number of pages the process has in real memory. This is just the pages which count toward text, data, or stack space. This does not include pages which have not been demand-loaded in, or which are swapped out. The resident set size is reported in bytes\n"}},
860860
{"residentSizePercent",
861-
{"arangodb_process_statistics_resident_set_size_percent", "gauge", "The relative size of the number of pages the process has in real memory compared to system memory. This is just the pages which count toward text, data, or stack space. This does not include pages which have not been demand-loaded in, or which are swapped out. The value is a ratio between 0.00 and 1.00.\n"}},
861+
{"arangodb_process_statistics_resident_set_size_percent", "gauge", "The relative size of the number of pages the process has in real memory compared to system memory. This is just the pages which count toward text, data, or stack space. This does not include pages which have not been demand-loaded in, or which are swapped out. The value is a ratio between 0.00 and 1.00\n"}},
862862
{"virtualSize",
863-
{"arangodb_process_statistics_virtual_memory_size", "gauge", "On Windows, this figure contains the total amount of memory that the memory manager has committed for the arangod process. On other systems, this figure contains The size of the virtual memory the process is using.\n"}},
863+
{"arangodb_process_statistics_virtual_memory_size", "gauge", "On Windows, this figure contains the total amount of memory that the memory manager has committed for the arangod process. On other systems, this figure contains The size of the virtual memory the process is using\n"}},
864864
{"clientHttpConnections",
865865
{"arangodb_client_connection_statistics_client_connections", "gauge",
866-
"The number of client connections that are currently open.\n"}},
866+
"The number of client connections that are currently open\n"}},
867867
{"connectionTime",
868868
{"arangodb_client_connection_statistics_connection_time_bucket", "gauge",
869-
"Total connection time of a client.\n"}},
869+
"Total connection time of a client\n"}},
870870
{"connectionTimeCount",
871871
{"arangodb_client_connection_statistics_connection_time_count", "gauge",
872-
"Total connection time of a client.\n"}},
872+
"Total connection time of a client\n"}},
873873
{"connectionTimeSum",
874874
{"arangodb_client_connection_statistics_connection_time_sum", "gauge",
875-
"Total connection time of a client.\n"}},
875+
"Total connection time of a client\n"}},
876876
{"totalTime",
877877
{"arangodb_client_connection_statistics_total_time_bucket", "gauge",
878-
"Total time needed to answer a request.\n"}},
878+
"Total time needed to answer a request\n"}},
879879
{"totalTimeCount",
880880
{"arangodb_client_connection_statistics_total_time_count", "gauge",
881-
"Total time needed to answer a request.\n"}},
881+
"Total time needed to answer a request\n"}},
882882
{"totalTimeSum",
883883
{"arangodb_client_connection_statistics_total_time_sum", "gauge",
884-
"Total time needed to answer a request.\n"}},
884+
"Total time needed to answer a request\n"}},
885885
{"requestTime",
886886
{"arangodb_client_connection_statistics_request_time_bucket", "gauge",
887-
"Request time needed to answer a request.\n"}},
887+
"Request time needed to answer a request\n"}},
888888
{"requestTimeCount",
889889
{"arangodb_client_connection_statistics_request_time_count", "gauge",
890-
"Request time needed to answer a request.\n"}},
890+
"Request time needed to answer a request\n"}},
891891
{"requestTimeSum",
892892
{"arangodb_client_connection_statistics_request_time_sum", "gauge",
893-
"Request time needed to answer a request.\n"}},
893+
"Request time needed to answer a request\n"}},
894894
{"queueTime",
895895
{"arangodb_client_connection_statistics_queue_time_bucket", "gauge",
896-
"Request time needed to answer a request.\n"}},
896+
"Request time needed to answer a request\n"}},
897897
{"queueTimeCount",
898898
{"arangodb_client_connection_statistics_queue_time_count", "gauge",
899-
"Request time needed to answer a request.\n"}},
899+
"Request time needed to answer a request\n"}},
900900
{"queueTimeSum",
901901
{"arangodb_client_connection_statistics_queue_time_sum", "gauge",
902-
"Request time needed to answer a request.\n"}},
902+
"Request time needed to answer a request\n"}},
903903
{"ioTime",
904904
{"arangodb_client_connection_statistics_io_time_bucket", "gauge",
905-
"Request time needed to answer a request.\n"}},
905+
"Request time needed to answer a request\n"}},
906906
{"ioTimeCount",
907907
{"arangodb_client_connection_statistics_io_time_count", "gauge",
908-
"Request time needed to answer a request.\n"}},
908+
"Request time needed to answer a request\n"}},
909909
{"ioTimeSum",
910910
{"arangodb_client_connection_statistics_io_time_sum", "gauge",
911-
"Request time needed to answer a request.\n"}},
911+
"Request time needed to answer a request\n"}},
912912
{"httpReqsTotal",
913913
{"arangodb_http_request_statistics_total_requests", "gauge",
914-
"Total number of HTTP requests.\n"}},
914+
"Total number of HTTP requests\n"}},
915915
{"httpReqsAsync",
916916
{"arangodb_http_request_statistics_async_requests", "gauge",
917-
"Number of asynchronously executed HTTP requests.\n"}},
917+
"Number of asynchronously executed HTTP requests\n"}},
918918
{"httpReqsDelete",
919919
{"arangodb_http_request_statistics_http_delete_requests", "gauge",
920-
"Number of HTTP DELETE requests.\n"}},
920+
"Number of HTTP DELETE requests\n"}},
921921
{"httpReqsGet",
922922
{"arangodb_http_request_statistics_http_get_requests", "gauge",
923-
"Number of HTTP GET requests.\n"}},
923+
"Number of HTTP GET requests\n"}},
924924
{"httpReqsHead",
925925
{"arangodb_http_request_statistics_http_head_requests", "gauge",
926-
"Number of HTTP HEAD requests.\n"}},
926+
"Number of HTTP HEAD requests\n"}},
927927
{"httpReqsOptions",
928928
{"arangodb_http_request_statistics_http_options_requests", "gauge",
929-
"Number of HTTP OPTIONS requests.\n"}},
929+
"Number of HTTP OPTIONS requests\n"}},
930930
{"httpReqsPatch",
931931
{"arangodb_http_request_statistics_http_patch_requests", "gauge",
932-
"Number of HTTP PATH requests.\n"}},
932+
"Number of HTTP PATH requests\n"}},
933933
{"httpReqsPost",
934934
{"arangodb_http_request_statistics_http_post_requests", "gauge",
935-
"Number of HTTP POST requests.\n"}},
935+
"Number of HTTP POST requests\n"}},
936936
{"httpReqsPut",
937937
{"arangodb_http_request_statistics_http_put_requests", "gauge",
938-
"Number of HTTP PUT requests.\n"}},
938+
"Number of HTTP PUT requests\n"}},
939939
{"httpReqsOther",
940940
{"arangodb_http_request_statistics_other_http_requests", "gauge",
941-
"Number of other HTTP requests.\n"}},
941+
"Number of other HTTP requests\n"}},
942942
{"uptime",
943943
{"arangodb_server_statistics_server_uptime", "gauge",
944-
"Number of seconds elapsed since server start.\n"}},
944+
"Number of seconds elapsed since server start\n"}},
945945
{"physicalSize",
946946
{"arangodb_server_statistics_physical_memory", "gauge",
947-
"Physical memory in bytes.\n"}}
947+
"Physical memory in bytes\n"}}
948948
};
949949

950950
void StatisticsWorker::generateRawStatistics(std::string& result, double const& now) {

0 commit comments

Comments
 (0)
0