Skip to content

Commit 48d2443

Browse files
tbaveliertbavelier
authored
[FRAGENT-2864][Gitlab] Adds additional Geo metrics (#17420)
* Metrics map + metadata.csv * Release note * Overrides for OM + unit tests * Update release note
1 parent 6092f98 commit 48d2443

File tree

5 files changed

+188
-1
lines changed

5 files changed

+188
-1
lines changed

‎gitlab/changelog.d/17420.added

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Adds additional Geo metrics. *Note: Some metrics are only available depending on your Gitlab version: refer to the Metrics sub-section in Data Collected available in our [documentation](https://docs.datadoghq.com/integrations/gitlab/) to see the minimum required version (indicated within brackets). For instance, `gitlab.geo.group.wiki.repositories` requires at least `13.10`.*

‎gitlab/datadog_checks/gitlab/metrics.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@
1717
'geo_cursor_last_event_timestamp': 'geo.cursor_last_event_timestamp',
1818
'geo_db_replication_lag_seconds': 'geo.db_replication_lag_seconds',
1919
'geo_job_artifacts_synced_missing_on_primary': 'geo.job_artifacts_synced_missing_on_primary',
20+
'geo_group_wiki_repositories': 'geo.group.wiki.repositories',
21+
'geo_group_wiki_repositories_checksum_total': 'geo.group.wiki.repositories_checksum_total',
22+
'geo_group_wiki_repositories_checksummed': 'geo.group.wiki.repositories_checksummed',
23+
'geo_group_wiki_repositories_checksum_failed': 'geo.group.wiki.repositories_checksum_failed',
24+
'geo_group_wiki_repositories_synced': 'geo.group.wiki.repositories_synced',
25+
'geo_group_wiki_repositories_failed': 'geo.group.wiki.repositories_failed',
26+
'geo_group_wiki_repositories_registry': 'geo.group.wiki.repositories_registry',
27+
'geo_group_wiki_repositories_verification_total': 'geo.group.wiki.repositories_verification_total',
28+
'geo_group_wiki_repositories_verified': 'geo.group.wiki.repositories_verified',
29+
'geo_group_wiki_repositories_verification_failed': 'geo.group.wiki.repositories_verification_failed',
2030
'geo_last_event_id': 'geo.last_event_id',
2131
'geo_last_event_timestamp': 'geo.last_event_timestamp',
2232
'geo_last_successful_status_check_timestamp': 'geo.last_successful_status_check_timestamp',
@@ -36,6 +46,26 @@
3646
'geo_package_files_failed': 'geo.package_files_failed',
3747
'geo_package_files_registry': 'geo.package_files_registry',
3848
'geo_package_files_synced': 'geo.package_files_synced',
49+
'geo_project_repositories': 'geo.project.repositories',
50+
'geo_project_repositories_checksum_total': 'geo.project.repositories_checksum_total',
51+
'geo_project_repositories_checksummed': 'geo.project.repositories_checksummed',
52+
'geo_project_repositories_checksum_failed': 'geo.project.repositories_checksum_failed',
53+
'geo_project_repositories_failed': 'geo.project.repositories_failed',
54+
'geo_project_repositories_registry': 'geo.project.repositories_registry',
55+
'geo_project_repositories_synced': 'geo.project.repositories_synced',
56+
'geo_project_repositories_verification_total': 'geo.project.repositories_verification_total',
57+
'geo_project_repositories_verified': 'geo.project.repositories_verified',
58+
'geo_project_repositories_verification_failed': 'geo.project.repositories_verification_failed',
59+
'geo_project_wiki_repositories': 'geo.project.wiki.repositories',
60+
'geo_project_wiki_repositories_checksum_total': 'geo.project.wiki.repositories_checksum_total',
61+
'geo_project_wiki_repositories_checksummed': 'geo.project.wiki.repositories_checksummed',
62+
'geo_project_wiki_repositories_checksum_failed': 'geo.project.wiki.repositories_checksum_failed',
63+
'geo_project_wiki_repositories_synced': 'geo.project.wiki.repositories_synced',
64+
'geo_project_wiki_repositories_failed': 'geo.project.wiki.repositories_failed',
65+
'geo_project_wiki_repositories_registry': 'geo.project.wiki.repositories_registry',
66+
'geo_project_wiki_repositories_verification_total': 'geo.project.wiki.repositories_verification_total',
67+
'geo_project_wiki_repositories_verified': 'geo.project.wiki.repositories_verified',
68+
'geo_project_wiki_repositories_verification_failed': 'geo.project.wiki.repositories_verification_failed',
3969
'geo_repositories': 'geo.repositories',
4070
'geo_repositories_checked': 'geo.repositories_checked_count',
4171
'geo_repositories_checked_count': 'geo.repositories_checked_count',
@@ -215,6 +245,12 @@
215245
OPENMETRICS_V2_TYPE_OVERRIDES = {
216246
"gitlab_transaction_rails_queue_duration_total": "gauge",
217247
"ruby_process_cpu_seconds_total": "gauge",
248+
"geo_group_wiki_repositories_checksum_total": "gauge",
249+
"geo_group_wiki_repositories_verification_total": "gauge",
250+
"geo_project_repositories_checksum_total": "gauge",
251+
"geo_project_repositories_verification_total": "gauge",
252+
"geo_project_wiki_repositories_checksum_total": "gauge",
253+
"geo_project_wiki_repositories_verification_total": "gauge",
218254
}
219255

220256

‎gitlab/metadata.csv

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ gitlab.geo.attachments_synced_missing_on_primary,gauge,,,,The number of attachme
4242
gitlab.geo.cursor_last_event_id,gauge,,,,The last database ID of the event log processed by the secondary,0,gitlab,geo last cursor id,
4343
gitlab.geo.cursor_last_event_timestamp,gauge,,,,The last UNIX timestamp of the event log processed by the secondary,0,gitlab,geo last cursor timestamp,
4444
gitlab.geo.db_replication_lag_seconds,gauge,,second,,The database replication lag (seconds),-1,gitlab,geo replication lag,
45+
gitlab.geo.group.wiki.repositories,gauge,,,,Number of group wikis on primary (13.10),0,gitlab,geo group wikis repositories,
46+
gitlab.geo.group.wiki.repositories_checksum_failed,gauge,,,,Number of group wikis that failed to calculate the checksum on primary (13.10),-1,gitlab,geo group wikis repositories checksum failed,
47+
gitlab.geo.group.wiki.repositories_checksum_total,gauge,,,,Number of group wikis to checksum on primary (16.3),0,gitlab,geo group wikis repositories checksum tot,
48+
gitlab.geo.group.wiki.repositories_checksummed,gauge,,,,Number of group wikis that successfully calculated the checksum on primary (13.10),0,gitlab,geo group wikis repositories checksummed,
49+
gitlab.geo.group.wiki.repositories_failed,gauge,,,,Number of syncable group wikis failed to sync on secondary (13.10),-1,gitlab,geo group wikis repositories failed,
50+
gitlab.geo.group.wiki.repositories_registry,gauge,,,,Number of group wikis in the registry (13.10),0,gitlab,geo group wikis repositories registry,
51+
gitlab.geo.group.wiki.repositories_synced,gauge,,,,Number of syncable group wikis synced on secondary (13.10),0,gitlab,geo group wikis repositories synced,
52+
gitlab.geo.group.wiki.repositories_verification_failed,gauge,,,,Number of group wikis that failed verification on secondary (16.3),-1,gitlab,geo group wikis repositories verif failed,
53+
gitlab.geo.group.wiki.repositories_verification_total,gauge,,,,Number of group wikis to attempt to verify on secondary (16.3),0,gitlab,geo group wikis repositories verif tot,
54+
gitlab.geo.group.wiki.repositories_verified,gauge,,,,Number of group wikis successfully verified on secondary (16.3),0,gitlab,geo group wikis repositories verified,
4555
gitlab.geo.job_artifacts_synced_missing_on_primary,gauge,,,,The number of job artifacts marked as synced due to the file missing on the primary,-1,gitlab,geo lfs artifact missing,
4656
gitlab.geo.last_event_id,gauge,,,,The database ID of the latest event log entry on the primary,0,gitlab,geo last id,
4757
gitlab.geo.last_event_timestamp,gauge,,,,The UNIX timestamp of the latest event log entry on the primary,0,gitlab,geo last timestamp,
@@ -62,6 +72,26 @@ gitlab.geo.package_files_checksummed,gauge,,,,Number of package files checksumme
6272
gitlab.geo.package_files_failed,gauge,,,,Number of syncable package files failed to sync on secondary,0,gitlab,geo package files failed,
6373
gitlab.geo.package_files_registry,gauge,,,,Number of package files in the registry,0,gitlab,geo package files registry,
6474
gitlab.geo.package_files_synced,gauge,,,,Number of syncable package files synced on secondary,0,gitlab,geo package files synced,
75+
gitlab.geo.project.repositories,gauge,,,,Number of Project Repositories on primary (16.2),0,gitlab,geo project repositories,
76+
gitlab.geo.project.repositories_checksum_failed,gauge,,,,Number of Project Repositories that failed to calculate the checksum on primary (16.2),-1,gitlab,geo project repositories checksum failed,
77+
gitlab.geo.project.repositories_checksum_total,gauge,,,,Number of Project Repositories to checksum on primary (16.2),0,gitlab,geo project repositories checksum tot,
78+
gitlab.geo.project.repositories_checksummed,gauge,,,,Number of Project Repositories that successfully calculated the checksum on primary (16.2),0,gitlab,geo project repositories checksummed,
79+
gitlab.geo.project.repositories_failed,gauge,,,,Number of syncable Project Repositories failed to sync on secondary (16.2),-1,gitlab,geo project repositories failed,
80+
gitlab.geo.project.repositories_registry,gauge,,,,Number of Project Repositories in the registry (16.2),0,gitlab,geo project repositories registry,
81+
gitlab.geo.project.repositories_synced,gauge,,,,Number of syncable Project Repositories synced on secondary (16.2),0,gitlab,geo project repositories synced,
82+
gitlab.geo.project.repositories_verification_failed,gauge,,,,Number of Project Repositories that failed verification on secondary (16.2),-1,gitlab,geo project repositories verif failed,
83+
gitlab.geo.project.repositories_verification_total,gauge,,,,Number of Project Repositories to attempt to verify on secondary (16.2),0,gitlab,geo project repositories verif tot,
84+
gitlab.geo.project.repositories_verified,gauge,,,,Number of Project Repositories successfully verified on secondary (16.2),0,gitlab,geo project repositories verified,
85+
gitlab.geo.project.wiki.repositories,gauge,,,,Number of Project Wiki Repositories on primary (15.10),0,gitlab,geo project wiki repositories,
86+
gitlab.geo.project.wiki.repositories_checksum_failed,gauge,,,,Number of Project Wiki Repositories that failed to calculate the checksum on primary (15.10),-1,gitlab,geo project wiki repositories checksum failed,
87+
gitlab.geo.project.wiki.repositories_checksum_total,gauge,,,,Number of Project Wiki Repositories to checksum on primary (15.10),0,gitlab,geo project wiki repositories checksum tot,
88+
gitlab.geo.project.wiki.repositories_checksummed,gauge,,,,Number of Project Wiki Repositories that successfully calculated the checksum on primary (15.10),0,gitlab,geo project wiki repositories checksummed,
89+
gitlab.geo.project.wiki.repositories_failed,gauge,,,,Number of syncable Project Wiki Repositories failed to sync on secondary (15.10),-1,gitlab,geo project wiki repositories failed,
90+
gitlab.geo.project.wiki.repositories_registry,gauge,,,,Number of Project Wiki Repositories in the registry (15.10),0,gitlab,geo project wiki repositories registry,
91+
gitlab.geo.project.wiki.repositories_synced,gauge,,,,Number of syncable Project Wiki Repositories synced on secondary (15.10),0,gitlab,geo project wiki repositories synced,
92+
gitlab.geo.project.wiki.repositories_verification_failed,gauge,,,,Number of Project Wiki Repositories that failed verification on secondary (15.10),-1,gitlab,geo project wiki repositories verif failed,
93+
gitlab.geo.project.wiki.repositories_verification_total,gauge,,,,Number of Project Wiki Repositories to attempt to verify on secondary (15.10),0,gitlab,geo project wiki repositories verif tot,
94+
gitlab.geo.project.wiki.repositories_verified,gauge,,,,Number of Project Wiki Repositories successfully verified on secondary (15.10),0,gitlab,geo project wiki repositories verified,
6595
gitlab.geo.repositories,gauge,,,,The total number of repositories available on primary,0,gitlab,geo repos,
6696
gitlab.geo.repositories_checked_count,gauge,,,,The number of repositories that have been checked via git fsck,0,gitlab,geo repos checked,
6797
gitlab.geo.repositories_checked_failed_count,gauge,,,,The number of repositories that have a failure from git fsck,-1,gitlab,geo repos checked failed,

‎gitlab/tests/common.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,36 @@
113113
"ruby.threads_running_threads",
114114
"transaction.rails_queue_duration_total",
115115
"ruby.process_cpu_seconds_total",
116+
"geo.group.wiki.repositories",
117+
"geo.group.wiki.repositories_checksum_total",
118+
"geo.group.wiki.repositories_checksummed",
119+
"geo.group.wiki.repositories_checksum_failed",
120+
"geo.group.wiki.repositories_failed",
121+
"geo.group.wiki.repositories_registry",
122+
"geo.group.wiki.repositories_synced",
123+
"geo.group.wiki.repositories_verification_failed",
124+
"geo.group.wiki.repositories_verified",
125+
"geo.group.wiki.repositories_verification_total",
126+
"geo.project.repositories",
127+
"geo.project.repositories_checksum_total",
128+
"geo.project.repositories_checksummed",
129+
"geo.project.repositories_checksum_failed",
130+
"geo.project.repositories_failed",
131+
"geo.project.repositories_registry",
132+
"geo.project.repositories_synced",
133+
"geo.project.repositories_verification_failed",
134+
"geo.project.repositories_verified",
135+
"geo.project.repositories_verification_total",
136+
"geo.project.wiki.repositories",
137+
"geo.project.wiki.repositories_checksum_total",
138+
"geo.project.wiki.repositories_checksummed",
139+
"geo.project.wiki.repositories_checksum_failed",
140+
"geo.project.wiki.repositories_failed",
141+
"geo.project.wiki.repositories_registry",
142+
"geo.project.wiki.repositories_synced",
143+
"geo.project.wiki.repositories_verification_failed",
144+
"geo.project.wiki.repositories_verified",
145+
"geo.project.wiki.repositories_verification_total",
116146
]
117147

118148
V1_METRICS = COMMON_METRICS + [

‎gitlab/tests/fixtures/metrics.txt

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10518,4 +10518,94 @@ promhttp_metric_handler_requests_in_flight 1
1051810518
# TYPE promhttp_metric_handler_requests_total counter
1051910519
promhttp_metric_handler_requests_total{code="200"} 48
1052010520
promhttp_metric_handler_requests_total{code="500"} 0
10521-
promhttp_metric_handler_requests_total{code="503"} 0
10521+
promhttp_metric_handler_requests_total{code="503"} 0
10522+
# HELP geo_group_wiki_repositories Multiprocess metric
10523+
# TYPE geo_group_wiki_repositories gauge
10524+
geo_group_wiki_repositories{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10525+
# HELP geo_group_wiki_repositories_checksum_total Multiprocess metric
10526+
# TYPE geo_group_wiki_repositories_checksum_total gauge
10527+
geo_group_wiki_repositories_checksum_total 10
10528+
# HELP geo_group_wiki_repositories_checksummed Multiprocess metric
10529+
# TYPE geo_group_wiki_repositories_checksummed gauge
10530+
geo_group_wiki_repositories_checksummed 10
10531+
# HELP geo_group_wiki_repositories_checksum_failed Multiprocess metric
10532+
# TYPE geo_group_wiki_repositories_checksum_failed gauge
10533+
geo_group_wiki_repositories_checksum_failed 10
10534+
# HELP geo_group_wiki_repositories_failed Multiprocess metric
10535+
# TYPE geo_group_wiki_repositories_failed gauge
10536+
geo_group_wiki_repositories_failed{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10537+
# HELP geo_group_wiki_repositories_registry Multiprocess metric
10538+
# TYPE geo_group_wiki_repositories_registry gauge
10539+
geo_group_wiki_repositories_registry{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10540+
# HELP geo_group_wiki_repositories_synced Multiprocess metric
10541+
# TYPE geo_group_wiki_repositories_synced gauge
10542+
geo_group_wiki_repositories_synced{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10543+
# HELP geo_group_wiki_repositories_verification_failed Multiprocess metric
10544+
# TYPE geo_group_wiki_repositories_verification_failed gauge
10545+
geo_group_wiki_repositories_verification_failed{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10546+
# HELP geo_group_wiki_repositories_verification_total Multiprocess metric
10547+
# TYPE geo_group_wiki_repositories_verification_total gauge
10548+
geo_group_wiki_repositories_verification_total{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10549+
# HELP geo_group_wiki_repositories_verified Multiprocess metric
10550+
# TYPE geo_group_wiki_repositories_verified gauge
10551+
geo_group_wiki_repositories_verified{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10552+
# HELP geo_project_repositories Multiprocess metric
10553+
# TYPE geo_project_repositories gauge
10554+
geo_project_repositories{name="aws_eu_north_1",url="aws_eu_north_1"} 3
10555+
# HELP geo_project_repositories_checksum_total Multiprocess metric
10556+
# TYPE geo_project_repositories_checksum_total gauge
10557+
geo_project_repositories_checksum_total 5
10558+
# HELP geo_project_repositories_checksummed Multiprocess metric
10559+
# TYPE geo_project_repositories_checksummed gauge
10560+
geo_project_repositories_checksummed 5
10561+
# HELP geo_project_repositories_checksum_failed Multiprocess metric
10562+
# TYPE geo_project_repositories_checksum_failed gauge
10563+
geo_project_repositories_checksum_failed 5
10564+
# HELP geo_project_repositories_failed Multiprocess metric
10565+
# TYPE geo_project_repositories_failed gauge
10566+
geo_project_repositories_failed{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10567+
# HELP geo_project_repositories_registry Multiprocess metric
10568+
# TYPE geo_project_repositories_registry gauge
10569+
geo_project_repositories_registry{name="aws_eu_north_1",url="aws_eu_north_1"} 3
10570+
# HELP geo_project_repositories_synced Multiprocess metric
10571+
# TYPE geo_project_repositories_synced gauge
10572+
geo_project_repositories_synced{name="aws_eu_north_1",url="aws_eu_north_1"} 3
10573+
# HELP geo_project_repositories_verification_failed Multiprocess metric
10574+
# TYPE geo_project_repositories_verification_failed gauge
10575+
geo_project_repositories_verification_failed{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10576+
# HELP geo_project_repositories_verification_total Multiprocess metric
10577+
# TYPE geo_project_repositories_verification_total gauge
10578+
geo_project_repositories_verification_total{name="aws_eu_north_1",url="aws_eu_north_1"} 3
10579+
# HELP geo_project_repositories_verified Multiprocess metric
10580+
# TYPE geo_project_repositories_verified gauge
10581+
geo_project_repositories_verified{name="aws_eu_north_1",url="aws_eu_north_1"} 3
10582+
# HELP geo_project_wiki_repositories Multiprocess metric
10583+
# TYPE geo_project_wiki_repositories gauge
10584+
geo_project_wiki_repositories{name="aws_eu_north_1",url="aws_eu_north_1"} 3
10585+
# HELP geo_project_wiki_repositories_checksum_total Multiprocess metric
10586+
# TYPE geo_project_wiki_repositories_checksum_total gauge
10587+
geo_project_wiki_repositories_checksum_total 5
10588+
# HELP geo_project_wiki_repositories_checksummed Multiprocess metric
10589+
# TYPE geo_project_wiki_repositories_checksummed gauge
10590+
geo_project_wiki_repositories_checksummed 5
10591+
# HELP geo_project_wiki_repositories_checksum_failed Multiprocess metric
10592+
# TYPE geo_project_wiki_repositories_checksum_failed gauge
10593+
geo_project_wiki_repositories_checksum_failed 5
10594+
# HELP geo_project_wiki_repositories_failed Multiprocess metric
10595+
# TYPE geo_project_wiki_repositories_failed gauge
10596+
geo_project_wiki_repositories_failed{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10597+
# HELP geo_project_wiki_repositories_registry Multiprocess metric
10598+
# TYPE geo_project_wiki_repositories_registry gauge
10599+
geo_project_wiki_repositories_registry{name="aws_eu_north_1",url="aws_eu_north_1"} 3
10600+
# HELP geo_project_wiki_repositories_synced Multiprocess metric
10601+
# TYPE geo_project_wiki_repositories_synced gauge
10602+
geo_project_wiki_repositories_synced{name="aws_eu_north_1",url="aws_eu_north_1"} 2
10603+
# HELP geo_project_wiki_repositories_verification_failed Multiprocess metric
10604+
# TYPE geo_project_wiki_repositories_verification_failed gauge
10605+
geo_project_wiki_repositories_verification_failed{name="aws_eu_north_1",url="aws_eu_north_1"} 0
10606+
# HELP geo_project_wiki_repositories_verification_total Multiprocess metric
10607+
# TYPE geo_project_wiki_repositories_verification_total gauge
10608+
geo_project_wiki_repositories_verification_total{name="aws_eu_north_1",url="aws_eu_north_1"} 2
10609+
# HELP geo_project_wiki_repositories_verified Multiprocess metric
10610+
# TYPE geo_project_wiki_repositories_verified gauge
10611+
geo_project_wiki_repositories_verified{name="aws_eu_north_1",url="aws_eu_north_1"} 2

0 commit comments

Comments
 (0)