Compilation results for gerrit2003.wikimedia.org: System changes detected
You can retrieve this result from host.json.Catalog differences
Summary
| Total Resources: | 3444 |
|---|---|
| Resources added: | 15 |
| Resources removed: | 15 |
| Resources modified: | 44 |
| Change percentage: | 2.15% |
Resources only in the new catalog
- File[/srv/site_path/bin]
- File[/srv/site_path/logs]
- File[/srv/site_path/etc/gerrit.config]
- File[/srv/site_path/etc/log4j.xml]
- File[/srv/site_path/plugins]
- File[/srv/site_path/etc/secure.config]
- File[/srv/site_path/lib]
- File[/srv/site_path/etc/ssh_host_key]
- File[/srv/site_path/etc/gitiles.config]
- File[/srv/site_path/etc/replication.config]
- File[/srv/site_path/etc/lfs.config]
- File[/srv/site_path/bin/gerrit.war]
- File[/srv/site_path/etc/its/templates]
- File[/srv/site_path]
- File[/srv/site_path/tmp]
Resources only in the old catalog
- File[/var/lib/gerrit/review_site/bin/gerrit.war]
- File[/var/lib/gerrit/review_site/etc/gitiles.config]
- File[/var/lib/gerrit/review_site/etc/secure.config]
- File[/var/lib/gerrit/review_site/etc/log4j.xml]
- File[/var/lib/gerrit/review_site/etc/replication.config]
- File[/var/lib/gerrit/review_site/etc/gerrit.config]
- File[/var/lib/gerrit/review_site/plugins]
- File[/var/lib/gerrit/review_site]
- File[/var/lib/gerrit/review_site/lib]
- File[/var/lib/gerrit/review_site/tmp]
- File[/var/lib/gerrit/review_site/bin]
- File[/var/lib/gerrit/review_site/logs]
- File[/var/lib/gerrit/review_site/etc/lfs.config]
- File[/var/lib/gerrit/review_site/etc/its/templates]
- File[/var/lib/gerrit/review_site/etc/ssh_host_key]
Resources modified
- File[/var/lib/gerrit/review_site/etc/lfs.config]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/lfs.config].orig +++ File[/var/lib/gerrit/review_site/etc/lfs.config] - mode => 0444 - owner => gerrit - group => gerrit
- Content differences:
--- /var/lib/gerrit/review_site/etc/lfs.config.orig +++ /var/lib/gerrit/review_site/etc/lfs.config @@ -1,4 +0,0 @@ -[storage] - backend = fs -[fs "gerrit-fs"] - directory = /srv/gerrit/data/lfs
- File[/var/www/page-bkg.cache.jpg]
- Parameters differences:
--- File[/var/www/page-bkg.cache.jpg].orig +++ File[/var/www/page-bkg.cache.jpg] @@ - target => /var/lib/gerrit/review_site/static/page-bkg.cache.jpg + target => /srv/site_path/static/page-bkg.cache.jpg
- File[/srv/site_path/etc/gitiles.config]
- Parameters differences:
--- File[/srv/site_path/etc/gitiles.config].orig +++ File[/srv/site_path/etc/gitiles.config] + mode => 0444 + owner => gerrit + group => gerrit
- Content differences:
--- /srv/site_path/etc/gitiles.config.orig +++ /srv/site_path/etc/gitiles.config @@ -0,0 +1,7 @@ +[gerrit] + cloneUrlType = http + linkname = gitiles + target = _self + baseUrl = https://gerrit.wikimedia.org/g +[markdown] + namedanchor = true
- File[/var/lib/gerrit/review_site/plugins]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/plugins].orig +++ File[/var/lib/gerrit/review_site/plugins] - target => /srv/deployment/gerrit/gerrit/plugins - owner => root - group => root - require => Scap::Target[gerrit/gerrit] - ensure => link
- File[/srv/site_path/etc/lfs.config]
- Parameters differences:
--- File[/srv/site_path/etc/lfs.config].orig +++ File[/srv/site_path/etc/lfs.config] + mode => 0444 + owner => gerrit + group => gerrit
- Content differences:
--- /srv/site_path/etc/lfs.config.orig +++ /srv/site_path/etc/lfs.config @@ -0,0 +1,4 @@ +[storage] + backend = fs +[fs "gerrit-fs"] + directory = /srv/gerrit/data/lfs
- File[/srv/site_path/etc/gerrit.config]
- Parameters differences:
--- File[/srv/site_path/etc/gerrit.config].orig +++ File[/srv/site_path/etc/gerrit.config] + mode => 0444 + owner => gerrit + group => gerrit
- Content differences:
--- /srv/site_path/etc/gerrit.config.orig +++ /srv/site_path/etc/gerrit.config @@ -0,0 +1,282 @@ +# Full documentation is at: +# +# https://gerrit.wikimedia.org/r/Documentation/config-gerrit.html +# + +[auth] + type = LDAP + cookieSecure = true + cookiePath = / + registerUrl = https://idm.wikimedia.org/signup/ + gitBasicAuth = true + gitBasicAuthPolicy = HTTP_LDAP +[cache] + directory = cache +[cache "changes_by_project"] + memoryLimit = 3096 +[cache "changeid_project"] + memoryLimit = 3096 +[cache "ldap_groups_byinclude"] + maxAge = 1 hour +[cache "ldap_usernames"] + maxAge = 1 hour + memoryLimit = 2048 +[cache "projects"] + memoryLimit = 3096 + loadOnStartup = true +[cache "static_content"] + maxAge = 1 day +[cache "web_sessions"] + maxAge = 90 days + memoryLimit = 8192 + diskLimit = 256m +[capability] + administrateServer = group ldap/gerritadmin +[change] + # Richer diff3 rendering for changes with conflicts T359821 + diff3ConflictView = true + disablePrivateChanges = true + # Moving changes may be counter-intuitive and probably needs + # discussion before turning it on. + # See https://gerrit-review.googlesource.com/Documentation/config-gerrit.html#change.move + # Since Gerrit v2.15 does not have the possibility to move + # changes, we turn it off for now. Once it has been discussed if + # we want it, we can still turn it on. + move = false + # Populate whether a change in mergeable in ChangeInfo objects + # Causes all open changes to be reindexed when the target reference + # advances. + mergeabilityComputationBehavior = API_REF_UPDATED_AND_CHANGE_REINDEX +[changeCleanup] + # Not actually used, but Gerrit complains if unset + interval = 1 week + startTime = Sat 02:59 +[commentlink "bugzilla"] + match = "\\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b" + link = https://bugzilla.wikimedia.org/$1 +[commentlink "changeid"] + match = \\b(I[0-9a-f]{7,40})\\b + link = /q/$1 +[commentlink "codereview"] + match = \\br(\\d+)\\b + link = https://www.mediawiki.org/wiki/Special:Code/MediaWiki/$1 +[commentlink "commit"] + match = (^|\\s|[:,!?\\(\\[\\{])([0-9a-f]{7,40})\\b + link = /q/$2 + prefix = $1 + text = $2 +[commentlink "cve"] + match = \\b(CVE\\-\\d{4}\\-\\d+)\\b + link = https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1 +[commentlink "its-phabricator"] + # $1 must hold the bug number because of the notification bots that are using this. + match = "\\bT(\\d+)(#\\d+)?\\b(?![#\"]|</a>)" + link = https://phabricator.wikimedia.org/T$1$2 +[commentlink "mingle-analytics"] + match = "\\b([aA]nalytics\\s*[:-]?\\s*[cC]ard|[cC]ard\\s*[:-]?\\s*[aA]nalytics)\\s*\\#?\\s*(\\d+)\\b" + link = https://wikimedia.mingle.thoughtworks.com/projects/analytics/cards/$2 +[commentlink "rt"] + match = "\\b[rR][tT]\\:?\\s+#?(\\d+)\\b" + link = https://rt.wikimedia.org/Ticket/Display.html?id=$1 +[commentlink "scid"] + match = "\\b[sS][cC][iI][dD]\\:?\\s+#?(\\d+)\\b" + link = https://meta.wikimedia.org/w/index.php?oldid=$1 +[commitmessage] + maxSubjectLength = 100 + maxLineLength = 120 +[container] + # Parameters in the container section are solely used by the `gerrit.sh` + # wrapper which we do NOT use on the WMF instance. + # + # One must instead inject the parameters in the ExecStart systemd unit. + # + # `gerrit init` makes a few update, list them there to avoid unwanted + # modifications: + user = gerrit + javaHome = /usr/lib/jvm/java-17-openjdk-amd64 + javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance" + javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance" +[core] + packedGitOpenFiles = 20000 + packedGitLimit = 4g + packedGitWindowSize = 16k + streamFileThreshold = 100m + useRecursiveMerge = true +[execution] + defaultThreadPoolSize = 2 +[experiments] + # Enhance diff with ResembleJS - T341291 + enabled = UiFeature__new_image_diff_ui + + # Browser notifications + # Since Gerrit 3.8 and the default in 3.12 - T389327 + enabled = UiFeature__push_notifications +[gc] + interval = 1 week + startTime = Sat 02:00 +[gerrit] + basePath = /srv/gerrit/git + canonicalWebUrl = https://gerrit.wikimedia.org/r/ + faviconPath = static/wikimedia-codereview-logo.cache.ico + # Used in gerrit 2.16+ + # see https://gerrit-review.googlesource.com/Documentation/config-gerrit.html#gerrit.listProjectsFromIndex + listProjectsFromIndex = true + reportBugUrl = https://phabricator.wikimedia.org/maniphest/task/create/?projects=PHID-PROJ-lc5rwomzjp6fmcdpbw43 + serverId = e9e9afe9-4712-486d-8885-f54b72dd1951 +[groups] + newGroupsVisibleToAll = true +[http] + addUserAsResponseHeader = true +[httpd] + listenUrl = proxy-https://127.0.0.1:8080/r/ + maxQueued = 500 + minThreads = 10 + maxThreads = 60 + maxWait = 2 min + # Set the default explicitly. We require this to be longer than Apache 2 + # mod_proxy ProxyTimeout. See modules/profile/templates/gerrit/apache.erb + # where it is set to a lower value. + # + # Ref: https://phabricator.wikimedia.org/T246763#11637703 + idleTimeout = 30 sec +[index] + type = LUCENE +# User gerritbot +[its-phabricator] + url = https://phabricator.wikimedia.org/ + # To be removed once we upgrade to 2.14+. + username = gerritbot + commentOnChangeAbandoned = false + commentOnChangeMerged = false + commentOnChangeRestored = false + commentOnChangeCreated = false + commentOnCommentAdded = false + commentOnPatchSetCreated = false + commentOnRefUpdatedGitWeb = false +[log] + jsonLogging = true + textLogging = true + timeToKeep = 30d +[ldap] + server = ldaps://ldap-ro.codfw.wikimedia.org + accountBase = ou=people,dc=wikimedia,dc=org + accountPattern = (&(objectClass=person)(cn=${username})(!(pwdPolicySubentry=cn=disabled,ou=ppolicies,dc=wikimedia,dc=org))) + accountFullName = cn + groupBase = ou=groups,dc=wikimedia,dc=org + groupMemberPattern = (&(objectClass=groupOfNames)(member=${dn})) + groupScope = one + groupsVisibleToAll = true + # Fixes T152640 + localUsernameToLowerCase = true + connectTimeout = 5 s + readTimeout = 5 s +[lfs] + plugin = lfs +[mimetype "application/javascript"] + safe = true +[mimetype "application/x-php"] + safe = true +[mimetype "image/bmp"] + safe = true +[mimetype "image/gif"] + safe = true +[mimetype "image/jpeg"] + safe = true +[mimetype "image/png"] + safe = true +[mimetype "image/tiff"] + safe = true +[mimetype "image/x-icon"] + safe = true +[mimetype "text/css"] + safe = true +[mimetype "text/javascript"] + safe = true +[mimetype "text/plain"] + safe = true +[mimetype "text/x-php"] + safe = true + +# https://gerrit.wikimedia.org/r/plugins/metrics-reporter-prometheus/Documentation/config.md +[plugin "metrics-reporter-prometheus"] +# The pattern matching is done against the Gerrit internal metrics listed at +# https://gerrit.wikimedia.org/r/Documentation/metrics.html +# +# Metrics exposed by the plugin can be seen at: +# https://gerrit.wikimedia.org/r/plugins/metrics-reporter-prometheus/metrics + excludeMetrics = ^change/submit.* + excludeMetrics = ^http/server/rest_api/.* + excludeMetrics = ^http/server/rest_api/.* + excludeMetrics = license/cla_check_count + excludeMetrics = ^plugin/latency.* + excludeMetrics = ^reviewer_suggestion/.* + excludeMetrics = ^sequence/next_id_latency.* + +# https://gerrit.wikimedia.org/r/plugins/readonly/Documentation/config.md +[plugin "readonly"] +# When doing switch over we need to be able to monitor the leftover replication +# tasks by using `replication list`. We might also want to start replications +# and thus allow any `replication` command. +allowSshCommand = ^replication + +# https://gerrit.wikimedia.org/r/plugins/rename-project/Documentation/config.md +[plugin "rename-project"] + # The primary sends to replica daemons the `gerrit rename-project` command + # The `gerrit2` user is in the Administators group on Gerrit + url = ssh://gerrit2@gerrit1003.wikimedia.org:29418 + url = ssh://gerrit2@gerrit2002.wikimedia.org:29418 + +[plugin "webhooks"] + sslVerify = true + +[noteDb "changes"] + autoMigrate = false + trial = false + write = true + read = true + sequence = true + primaryStorage = note db + disableReviewDb = true +[pack] + deltacompression = true +[receive] + maxObjectSizeLimit = 100m + maxBatchChanges = 10 + enableSignedPush = false + autogc = false +[repository "*"] + ownerGroup = Administrators +[repository "mediawiki/*"] + ownerGroup = mediawiki +[repository "operations/*"] + ownerGroup = ldap/ops +[sendemail] + includeDiff = true + connectTimeout = 30 sec + smtpServer = localhost + threadPoolSize = 2 +[sshd] + listenAddress = *:29418 + loginGraceTime = 60 s + idleTimeout = 3600 s + maxConnectionsPerUser = 8 + threads = 28 + batchThreads = 4 + # Avoid some fetches issues over ssh + # Intentionally undocumented upstream + # T263293 + enableChannelIdTracking = false +[trackingid "bugzilla"] + footer = Bug: + match = "\\#?\\d{1,6}" + system = Bugzilla +[trackingid "phabricator"] + footer = Bug: + match = T\\d+ + system = Phab +[trackingid "rt"] + footer = RT: + match = "\\#?\\d{1,6}" + system = RT +[user] + email = gerrit@wikimedia.org- File[/lib/systemd/system/gerrit.service]
- Content differences:
--- /lib/systemd/system/gerrit.service.orig +++ /lib/systemd/system/gerrit.service @@ -7,7 +7,7 @@ Group=gerrit Type=simple EnvironmentFile=/etc/default/gerrit -ExecStart=/usr/lib/jvm/java-17-openjdk-amd64/bin/java -Xmx64g -Xms64g -Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance -Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance -Dh2.maxCompactTime=15000 -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=15 -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -XX:+ExitOnOutOfMemoryError -XX:HeapDumpPath=/srv/gerrit -jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site +ExecStart=/usr/lib/jvm/java-17-openjdk-amd64/bin/java -Xmx64g -Xms64g -Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance -Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance -Dh2.maxCompactTime=15000 -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=15 -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -XX:+ExitOnOutOfMemoryError -XX:HeapDumpPath=/srv/gerrit -jar /srv/site_path/bin/gerrit.war daemon -d /srv/site_path # Give it a bit more time to terminate cleanly. #
- File[/var/lib/gerrit/review_site/etc/gerrit.config]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/gerrit.config].orig +++ File[/var/lib/gerrit/review_site/etc/gerrit.config] - mode => 0444 - owner => gerrit - group => gerrit
- Content differences:
--- /var/lib/gerrit/review_site/etc/gerrit.config.orig +++ /var/lib/gerrit/review_site/etc/gerrit.config @@ -1,282 +0,0 @@ -# Full documentation is at: -# -# https://gerrit.wikimedia.org/r/Documentation/config-gerrit.html -# - -[auth] - type = LDAP - cookieSecure = true - cookiePath = / - registerUrl = https://idm.wikimedia.org/signup/ - gitBasicAuth = true - gitBasicAuthPolicy = HTTP_LDAP -[cache] - directory = cache -[cache "changes_by_project"] - memoryLimit = 3096 -[cache "changeid_project"] - memoryLimit = 3096 -[cache "ldap_groups_byinclude"] - maxAge = 1 hour -[cache "ldap_usernames"] - maxAge = 1 hour - memoryLimit = 2048 -[cache "projects"] - memoryLimit = 3096 - loadOnStartup = true -[cache "static_content"] - maxAge = 1 day -[cache "web_sessions"] - maxAge = 90 days - memoryLimit = 8192 - diskLimit = 256m -[capability] - administrateServer = group ldap/gerritadmin -[change] - # Richer diff3 rendering for changes with conflicts T359821 - diff3ConflictView = true - disablePrivateChanges = true - # Moving changes may be counter-intuitive and probably needs - # discussion before turning it on. - # See https://gerrit-review.googlesource.com/Documentation/config-gerrit.html#change.move - # Since Gerrit v2.15 does not have the possibility to move - # changes, we turn it off for now. Once it has been discussed if - # we want it, we can still turn it on. - move = false - # Populate whether a change in mergeable in ChangeInfo objects - # Causes all open changes to be reindexed when the target reference - # advances. - mergeabilityComputationBehavior = API_REF_UPDATED_AND_CHANGE_REINDEX -[changeCleanup] - # Not actually used, but Gerrit complains if unset - interval = 1 week - startTime = Sat 02:59 -[commentlink "bugzilla"] - match = "\\b[bB][uU][gG]\\:?\\s+#?(\\d+)\\b" - link = https://bugzilla.wikimedia.org/$1 -[commentlink "changeid"] - match = \\b(I[0-9a-f]{7,40})\\b - link = /q/$1 -[commentlink "codereview"] - match = \\br(\\d+)\\b - link = https://www.mediawiki.org/wiki/Special:Code/MediaWiki/$1 -[commentlink "commit"] - match = (^|\\s|[:,!?\\(\\[\\{])([0-9a-f]{7,40})\\b - link = /q/$2 - prefix = $1 - text = $2 -[commentlink "cve"] - match = \\b(CVE\\-\\d{4}\\-\\d+)\\b - link = https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1 -[commentlink "its-phabricator"] - # $1 must hold the bug number because of the notification bots that are using this. - match = "\\bT(\\d+)(#\\d+)?\\b(?![#\"]|</a>)" - link = https://phabricator.wikimedia.org/T$1$2 -[commentlink "mingle-analytics"] - match = "\\b([aA]nalytics\\s*[:-]?\\s*[cC]ard|[cC]ard\\s*[:-]?\\s*[aA]nalytics)\\s*\\#?\\s*(\\d+)\\b" - link = https://wikimedia.mingle.thoughtworks.com/projects/analytics/cards/$2 -[commentlink "rt"] - match = "\\b[rR][tT]\\:?\\s+#?(\\d+)\\b" - link = https://rt.wikimedia.org/Ticket/Display.html?id=$1 -[commentlink "scid"] - match = "\\b[sS][cC][iI][dD]\\:?\\s+#?(\\d+)\\b" - link = https://meta.wikimedia.org/w/index.php?oldid=$1 -[commitmessage] - maxSubjectLength = 100 - maxLineLength = 120 -[container] - # Parameters in the container section are solely used by the `gerrit.sh` - # wrapper which we do NOT use on the WMF instance. - # - # One must instead inject the parameters in the ExecStart systemd unit. - # - # `gerrit init` makes a few update, list them there to avoid unwanted - # modifications: - user = gerrit - javaHome = /usr/lib/jvm/java-17-openjdk-amd64 - javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance" - javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance" -[core] - packedGitOpenFiles = 20000 - packedGitLimit = 4g - packedGitWindowSize = 16k - streamFileThreshold = 100m - useRecursiveMerge = true -[execution] - defaultThreadPoolSize = 2 -[experiments] - # Enhance diff with ResembleJS - T341291 - enabled = UiFeature__new_image_diff_ui - - # Browser notifications - # Since Gerrit 3.8 and the default in 3.12 - T389327 - enabled = UiFeature__push_notifications -[gc] - interval = 1 week - startTime = Sat 02:00 -[gerrit] - basePath = /srv/gerrit/git - canonicalWebUrl = https://gerrit.wikimedia.org/r/ - faviconPath = static/wikimedia-codereview-logo.cache.ico - # Used in gerrit 2.16+ - # see https://gerrit-review.googlesource.com/Documentation/config-gerrit.html#gerrit.listProjectsFromIndex - listProjectsFromIndex = true - reportBugUrl = https://phabricator.wikimedia.org/maniphest/task/create/?projects=PHID-PROJ-lc5rwomzjp6fmcdpbw43 - serverId = e9e9afe9-4712-486d-8885-f54b72dd1951 -[groups] - newGroupsVisibleToAll = true -[http] - addUserAsResponseHeader = true -[httpd] - listenUrl = proxy-https://127.0.0.1:8080/r/ - maxQueued = 500 - minThreads = 10 - maxThreads = 60 - maxWait = 2 min - # Set the default explicitly. We require this to be longer than Apache 2 - # mod_proxy ProxyTimeout. See modules/profile/templates/gerrit/apache.erb - # where it is set to a lower value. - # - # Ref: https://phabricator.wikimedia.org/T246763#11637703 - idleTimeout = 30 sec -[index] - type = LUCENE -# User gerritbot -[its-phabricator] - url = https://phabricator.wikimedia.org/ - # To be removed once we upgrade to 2.14+. - username = gerritbot - commentOnChangeAbandoned = false - commentOnChangeMerged = false - commentOnChangeRestored = false - commentOnChangeCreated = false - commentOnCommentAdded = false - commentOnPatchSetCreated = false - commentOnRefUpdatedGitWeb = false -[log] - jsonLogging = true - textLogging = true - timeToKeep = 30d -[ldap] - server = ldaps://ldap-ro.codfw.wikimedia.org - accountBase = ou=people,dc=wikimedia,dc=org - accountPattern = (&(objectClass=person)(cn=${username})(!(pwdPolicySubentry=cn=disabled,ou=ppolicies,dc=wikimedia,dc=org))) - accountFullName = cn - groupBase = ou=groups,dc=wikimedia,dc=org - groupMemberPattern = (&(objectClass=groupOfNames)(member=${dn})) - groupScope = one - groupsVisibleToAll = true - # Fixes T152640 - localUsernameToLowerCase = true - connectTimeout = 5 s - readTimeout = 5 s -[lfs] - plugin = lfs -[mimetype "application/javascript"] - safe = true -[mimetype "application/x-php"] - safe = true -[mimetype "image/bmp"] - safe = true -[mimetype "image/gif"] - safe = true -[mimetype "image/jpeg"] - safe = true -[mimetype "image/png"] - safe = true -[mimetype "image/tiff"] - safe = true -[mimetype "image/x-icon"] - safe = true -[mimetype "text/css"] - safe = true -[mimetype "text/javascript"] - safe = true -[mimetype "text/plain"] - safe = true -[mimetype "text/x-php"] - safe = true - -# https://gerrit.wikimedia.org/r/plugins/metrics-reporter-prometheus/Documentation/config.md -[plugin "metrics-reporter-prometheus"] -# The pattern matching is done against the Gerrit internal metrics listed at -# https://gerrit.wikimedia.org/r/Documentation/metrics.html -# -# Metrics exposed by the plugin can be seen at: -# https://gerrit.wikimedia.org/r/plugins/metrics-reporter-prometheus/metrics - excludeMetrics = ^change/submit.* - excludeMetrics = ^http/server/rest_api/.* - excludeMetrics = ^http/server/rest_api/.* - excludeMetrics = license/cla_check_count - excludeMetrics = ^plugin/latency.* - excludeMetrics = ^reviewer_suggestion/.* - excludeMetrics = ^sequence/next_id_latency.* - -# https://gerrit.wikimedia.org/r/plugins/readonly/Documentation/config.md -[plugin "readonly"] -# When doing switch over we need to be able to monitor the leftover replication -# tasks by using `replication list`. We might also want to start replications -# and thus allow any `replication` command. -allowSshCommand = ^replication - -# https://gerrit.wikimedia.org/r/plugins/rename-project/Documentation/config.md -[plugin "rename-project"] - # The primary sends to replica daemons the `gerrit rename-project` command - # The `gerrit2` user is in the Administators group on Gerrit - url = ssh://gerrit2@gerrit1003.wikimedia.org:29418 - url = ssh://gerrit2@gerrit2002.wikimedia.org:29418 - -[plugin "webhooks"] - sslVerify = true - -[noteDb "changes"] - autoMigrate = false - trial = false - write = true - read = true - sequence = true - primaryStorage = note db - disableReviewDb = true -[pack] - deltacompression = true -[receive] - maxObjectSizeLimit = 100m - maxBatchChanges = 10 - enableSignedPush = false - autogc = false -[repository "*"] - ownerGroup = Administrators -[repository "mediawiki/*"] - ownerGroup = mediawiki -[repository "operations/*"] - ownerGroup = ldap/ops -[sendemail] - includeDiff = true - connectTimeout = 30 sec - smtpServer = localhost - threadPoolSize = 2 -[sshd] - listenAddress = *:29418 - loginGraceTime = 60 s - idleTimeout = 3600 s - maxConnectionsPerUser = 8 - threads = 28 - batchThreads = 4 - # Avoid some fetches issues over ssh - # Intentionally undocumented upstream - # T263293 - enableChannelIdTracking = false -[trackingid "bugzilla"] - footer = Bug: - match = "\\#?\\d{1,6}" - system = Bugzilla -[trackingid "phabricator"] - footer = Bug: - match = T\\d+ - system = Phab -[trackingid "rt"] - footer = RT: - match = "\\#?\\d{1,6}" - system = RT -[user] - email = gerrit@wikimedia.org- File[/var/lib/gerrit/review_site/etc/ssh_host_key]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/ssh_host_key].orig +++ File[/var/lib/gerrit/review_site/etc/ssh_host_key] - mode => 0440 - owner => gerrit - show_diff => False - group => gerrit - ensure => present
- Content differences:
--- /var/lib/gerrit/review_site/etc/ssh_host_key.orig +++ /var/lib/gerrit/review_site/etc/ssh_host_key @@ -1,2 +0,0 @@ -Puppet::Pops::Types::PBinaryType::Binary -U05BS0VPSUwK
- File[/var/www/wikimedia-codereview-logo.cache.png]
- Parameters differences:
--- File[/var/www/wikimedia-codereview-logo.cache.png].orig +++ File[/var/www/wikimedia-codereview-logo.cache.png] @@ - target => /var/lib/gerrit/review_site/static/wikimedia-codereview-logo.cache.png + target => /srv/site_path/static/wikimedia-codereview-logo.cache.png
- File[/var/lib/gerrit/review_site/logs]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/logs].orig +++ File[/var/lib/gerrit/review_site/logs] - target => /var/log/gerrit - owner => gerrit - group => gerrit - require => Scap::Target[gerrit/gerrit] - ensure => link
- File[/srv/site_path/plugins]
- Parameters differences:
--- File[/srv/site_path/plugins].orig +++ File[/srv/site_path/plugins] + target => /srv/deployment/gerrit/gerrit/plugins + owner => root + group => root + require => Scap::Target[gerrit/gerrit] + ensure => link
- Class[Profile::Gerrit]
- Parameters differences:
--- Class[Profile::Gerrit].orig +++ Class[Profile::Gerrit] @@ - gerrit_site => /var/lib/gerrit/review_site + gerrit_site => /srv/site_path
- File[/srv/site_path/bin/gerrit.war]
- Parameters differences:
--- File[/srv/site_path/bin/gerrit.war].orig +++ File[/srv/site_path/bin/gerrit.war] + target => /srv/deployment/gerrit/gerrit/gerrit.war + owner => root + group => root + require => Scap::Target[gerrit/gerrit] + ensure => link
- File[/var/lib/gerrit/review_site/bin/gerrit.war]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/bin/gerrit.war].orig +++ File[/var/lib/gerrit/review_site/bin/gerrit.war] - target => /srv/deployment/gerrit/gerrit/gerrit.war - owner => root - group => root - require => Scap::Target[gerrit/gerrit] - ensure => link
- File[/var/lib/gerrit/review_site/etc/secure.config]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/secure.config].orig +++ File[/var/lib/gerrit/review_site/etc/secure.config] - mode => 0440 - owner => gerrit - group => gerrit
- Content differences:
--- /var/lib/gerrit/review_site/etc/secure.config.orig +++ /var/lib/gerrit/review_site/etc/secure.config @@ -1,10 +0,0 @@ -[auth] - registerEmailPrivateKey = AsL1PruNcpXuSAIjcCLqT -[its-phabricator] - token = cli-unknownvalue - -[plugin "javamelody"] - prometheusBearerToken = prome123 -[plugin "metrics-reporter-prometheus"] - prometheusBearerToken = prome123 -
- File[/var/lib/gerrit/review_site/etc/its/templates]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/its/templates].orig +++ File[/var/lib/gerrit/review_site/etc/its/templates] - mode => 0444 - owner => root - group => root - source => puppet:///modules/gerrit/its/ - recurse => True - ensure => directory - purge => True
- Nrpe::Check[check_gerrit]
- Parameters differences:
--- Nrpe::Check[check_gerrit].orig +++ Nrpe::Check[check_gerrit] @@ - command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site' + command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /srv/site_path/bin/gerrit.war daemon -d /srv/site_path'
- File[/var/lib/gerrit/review_site/lib]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/lib].orig +++ File[/var/lib/gerrit/review_site/lib] - ensure => directory - mode => 0555 - owner => gerrit - group => gerrit
- File[/etc/gerrit]
- Parameters differences:
--- File[/etc/gerrit].orig +++ File[/etc/gerrit] @@ - target => /var/lib/gerrit/review_site/etc + target => /srv/site_path/etc
- File[/srv/site_path/etc/its/templates]
- Parameters differences:
--- File[/srv/site_path/etc/its/templates].orig +++ File[/srv/site_path/etc/its/templates] + mode => 0444 + owner => root + group => root + source => puppet:///modules/gerrit/its/ + recurse => True + ensure => directory + purge => True
- Systemd::Unit[gerrit]
- File[/srv/site_path/etc/secure.config]
- Parameters differences:
--- File[/srv/site_path/etc/secure.config].orig +++ File[/srv/site_path/etc/secure.config] + mode => 0440 + owner => gerrit + group => gerrit
- Content differences:
--- /srv/site_path/etc/secure.config.orig +++ /srv/site_path/etc/secure.config @@ -0,0 +1,10 @@ +[auth] + registerEmailPrivateKey = AsL1PruNcpXuSAIjcCLqT +[its-phabricator] + token = cli-unknownvalue + +[plugin "javamelody"] + prometheusBearerToken = prome123 +[plugin "metrics-reporter-prometheus"] + prometheusBearerToken = prome123 +
- File[/srv/site_path/tmp]
- Parameters differences:
--- File[/srv/site_path/tmp].orig +++ File[/srv/site_path/tmp] + ensure => directory + mode => 0700 + owner => gerrit + group => gerrit
- File[/var/lib/gerrit/review_site]
- Parameters differences:
--- File[/var/lib/gerrit/review_site].orig +++ File[/var/lib/gerrit/review_site] - mode => 0755 - owner => gerrit - group => gerrit - source => puppet:///modules/gerrit/site - recurse => remote - ensure => directory
- File[/srv/site_path/lib]
- Parameters differences:
--- File[/srv/site_path/lib].orig +++ File[/srv/site_path/lib] + ensure => directory + mode => 0555 + owner => gerrit + group => gerrit
- File[/etc/default/gerrit]
- Content differences:
--- /etc/default/gerrit.orig +++ /etc/default/gerrit @@ -1,2 +1,2 @@ -GERRIT_SITE="/var/lib/gerrit/review_site" -GERRIT_WAR="/var/lib/gerrit/review_site/bin/gerrit.war" +GERRIT_SITE="/srv/site_path" +GERRIT_WAR="/srv/site_path/bin/gerrit.war"
- File[/srv/site_path/bin]
- Parameters differences:
--- File[/srv/site_path/bin].orig +++ File[/srv/site_path/bin] + ensure => directory + mode => 0775 + owner => gerrit + group => gerrit
- File[/srv/site_path/etc/replication.config]
- Parameters differences:
--- File[/srv/site_path/etc/replication.config].orig +++ File[/srv/site_path/etc/replication.config] + ensure => file + mode => 0444 + owner => gerrit + group => gerrit
- Content differences:
--- /srv/site_path/etc/replication.config.orig +++ /srv/site_path/etc/replication.config @@ -0,0 +1,41 @@ +#################################### +# This file is generated by puppet # +#################################### +[gerrit] + replicateOnStartup = true + # Re-enable this once the bug is fixed + # todo with reloading the replication config. + autoReload = false + defaultForceUpdate = true +[remote "github"] + authGroup = mediawiki-replication + createMissingRepositories = false + maxRetries = 50 + mirror = false + projects = ^(?:(?!apps\\/).)*$ + push = +refs/heads/*:refs/heads/* + push = +refs/tags/*:refs/tags/* + remoteNameStyle = dash + replicatePermissions = false + rescheduleDelay = 15 + threads = 2 + url = git@github.com:wikimedia/${name} +[remote "replica"] + defaultForceUpdate = true + mirror = true + replicateHiddenProjects = true + replicateProjectDeletions = true + replicationDelay = 5 + rescheduleDelay = 5 + threads = 4 + url = gerrit@gerrit1003.wikimedia.org:/srv/gerrit/git/${name}.git +[remote "spare"] + defaultForceUpdate = true + mirror = true + replicateHiddenProjects = true + replicateProjectDeletions = true + replicationDelay = 5 + rescheduleDelay = 5 + threads = 4 + url = gerrit@gerrit2002.wikimedia.org:/srv/gerrit/git/${name}.git +- File[/srv/site_path]
- Parameters differences:
--- File[/srv/site_path].orig +++ File[/srv/site_path] + mode => 0755 + owner => gerrit + group => gerrit + source => puppet:///modules/gerrit/site + recurse => remote + ensure => directory
- Nrpe::Monitor_service[gerrit]
- Parameters differences:
--- Nrpe::Monitor_service[gerrit].orig +++ Nrpe::Monitor_service[gerrit] @@ - nrpe_command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site' + nrpe_command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /srv/site_path/bin/gerrit.war daemon -d /srv/site_path'
- File[/srv/site_path/etc/log4j.xml]
- Parameters differences:
--- File[/srv/site_path/etc/log4j.xml].orig +++ File[/srv/site_path/etc/log4j.xml] + ensure => absent + owner => root + group => root
- File[/srv/site_path/etc/ssh_host_key]
- Parameters differences:
--- File[/srv/site_path/etc/ssh_host_key].orig +++ File[/srv/site_path/etc/ssh_host_key] + mode => 0440 + owner => gerrit + show_diff => False + group => gerrit + ensure => present
- Content differences:
--- /srv/site_path/etc/ssh_host_key.orig +++ /srv/site_path/etc/ssh_host_key @@ -0,0 +1,2 @@ +Puppet::Pops::Types::PBinaryType::Binary +U05BS0VPSUwK
- File[/var/lib/gerrit/review_site/etc/gitiles.config]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/gitiles.config].orig +++ File[/var/lib/gerrit/review_site/etc/gitiles.config] - mode => 0444 - owner => gerrit - group => gerrit
- Content differences:
--- /var/lib/gerrit/review_site/etc/gitiles.config.orig +++ /var/lib/gerrit/review_site/etc/gitiles.config @@ -1,7 +0,0 @@ -[gerrit] - cloneUrlType = http - linkname = gitiles - target = _self - baseUrl = https://gerrit.wikimedia.org/g -[markdown] - namedanchor = true
- File[/etc/nagios/nrpe.d/check_gerrit.cfg]
- Content differences:
--- /etc/nagios/nrpe.d/check_gerrit.cfg.orig +++ /etc/nagios/nrpe.d/check_gerrit.cfg @@ -1,2 +1,2 @@ # File generated by puppet. DO NOT edit by hand -command[check_gerrit]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site' +command[check_gerrit]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /srv/site_path/bin/gerrit.war daemon -d /srv/site_path'
- Class[Profile::Gerrit::Proxy]
- Parameters differences:
--- Class[Profile::Gerrit::Proxy].orig +++ Class[Profile::Gerrit::Proxy] @@ - gerrit_site => /var/lib/gerrit/review_site + gerrit_site => /srv/site_path
- File[/var/lib/gerrit/review_site/etc/log4j.xml]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/log4j.xml].orig +++ File[/var/lib/gerrit/review_site/etc/log4j.xml] - ensure => absent - owner => root - group => root
- File[/srv/site_path/logs]
- Parameters differences:
--- File[/srv/site_path/logs].orig +++ File[/srv/site_path/logs] + target => /var/log/gerrit + owner => gerrit + group => gerrit + require => Scap::Target[gerrit/gerrit] + ensure => link
- File[/var/lib/gerrit/review_site/tmp]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/tmp].orig +++ File[/var/lib/gerrit/review_site/tmp] - ensure => directory - mode => 0700 - owner => gerrit - group => gerrit
- Class[Gerrit]
- Parameters differences:
--- Class[Gerrit].orig +++ Class[Gerrit] @@ - gerrit_site => /var/lib/gerrit/review_site + gerrit_site => /srv/site_path
- Class[Profile::Gerrit::Migration]
- Parameters differences:
--- Class[Profile::Gerrit::Migration].orig +++ Class[Profile::Gerrit::Migration] @@ - gerrit_site => /var/lib/gerrit/review_site + gerrit_site => /srv/site_path
- Systemd::Service[gerrit]
- File[/var/lib/gerrit/review_site/etc/replication.config]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/etc/replication.config].orig +++ File[/var/lib/gerrit/review_site/etc/replication.config] - ensure => file - mode => 0444 - owner => gerrit - group => gerrit
- Content differences:
--- /var/lib/gerrit/review_site/etc/replication.config.orig +++ /var/lib/gerrit/review_site/etc/replication.config @@ -1,41 +0,0 @@ -#################################### -# This file is generated by puppet # -#################################### -[gerrit] - replicateOnStartup = true - # Re-enable this once the bug is fixed - # todo with reloading the replication config. - autoReload = false - defaultForceUpdate = true -[remote "github"] - authGroup = mediawiki-replication - createMissingRepositories = false - maxRetries = 50 - mirror = false - projects = ^(?:(?!apps\\/).)*$ - push = +refs/heads/*:refs/heads/* - push = +refs/tags/*:refs/tags/* - remoteNameStyle = dash - replicatePermissions = false - rescheduleDelay = 15 - threads = 2 - url = git@github.com:wikimedia/${name} -[remote "replica"] - defaultForceUpdate = true - mirror = true - replicateHiddenProjects = true - replicateProjectDeletions = true - replicationDelay = 5 - rescheduleDelay = 5 - threads = 4 - url = gerrit@gerrit1003.wikimedia.org:/srv/gerrit/git/${name}.git -[remote "spare"] - defaultForceUpdate = true - mirror = true - replicateHiddenProjects = true - replicateProjectDeletions = true - replicationDelay = 5 - rescheduleDelay = 5 - threads = 4 - url = gerrit@gerrit2002.wikimedia.org:/srv/gerrit/git/${name}.git -- File[/var/lib/gerrit/review_site/bin]
- Parameters differences:
--- File[/var/lib/gerrit/review_site/bin].orig +++ File[/var/lib/gerrit/review_site/bin] - ensure => directory - mode => 0775 - owner => gerrit - group => gerrit
- Content differences:
- Systemd::Service[gerrit]
- Class[Profile::Gerrit::Migration]
- Class[Gerrit]
- File[/var/lib/gerrit/review_site/tmp]
- File[/srv/site_path/logs]
- File[/var/lib/gerrit/review_site/etc/log4j.xml]
- Content differences:
- Content differences:
- File[/srv/site_path/etc/ssh_host_key]
- File[/srv/site_path/etc/log4j.xml]
- Nrpe::Monitor_service[gerrit]
- Content differences:
- File[/srv/site_path/etc/replication.config]
- File[/etc/default/gerrit]
- File[/srv/site_path/lib]
- File[/var/lib/gerrit/review_site]
- Content differences:
- Systemd::Unit[gerrit]
- File[/srv/site_path/etc/its/templates]
- File[/etc/gerrit]
- File[/var/lib/gerrit/review_site/lib]
- Nrpe::Check[check_gerrit]
- Content differences:
- File[/var/lib/gerrit/review_site/etc/secure.config]
- File[/var/lib/gerrit/review_site/bin/gerrit.war]
- File[/srv/site_path/bin/gerrit.war]
- Class[Profile::Gerrit]
- File[/srv/site_path/plugins]
- File[/var/lib/gerrit/review_site/logs]
- Content differences:
- Content differences:
- Content differences:
- Content differences:
- File[/srv/site_path/etc/lfs.config]
- Content differences:
- File[/srv/site_path/etc/gitiles.config]
- Content differences:
- Parameters differences: