Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional updates for instance usage #7619

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ As with any upgrade, we recommend:

. link:https:/doc/book/system-administration/backing-up/#jenkins_home[Backing up `JENKINS_HOME`].
. Testing the upgrade with your backup.
. Only after all required tests pass, performing the upgrade on your production instance.
. Only after all required tests pass, performing the upgrade on your production controller.

== Upgrading Jenkins

Expand Down Expand Up @@ -45,5 +45,5 @@ All agents must be running on the same JVM version as the controller, due to how
If you're upgrading your Jenkins controller to run on Java 17, you must upgrade the JVM on your agents.

Validating the version of each agent can be done with the plugin:versioncolumn[Versions Node Monitors] plugin.
This plugin provides information about the JVM version of each agent on the node management screen of your Jenkins instance.
This plugin provides information about the JVM version of each agent on the node management screen of your Jenkins controller.
This plugin can also be configured to automatically disconnect any agent with an incorrect JVM version.
2 changes: 1 addition & 1 deletion content/doc/book/system-administration/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Users not involved with system-level tasks will find this chapter of limited use
Individual sections may assume knowledge of information
from previous sections, but such assumptions will be explicitly called out and cross-referenced.

If you are a Jenkins administrator and want to know more about managing Jenkins nodes and instances, see
If you are a Jenkins administrator and want to know more about managing Jenkins nodes and deployments, refer to
<<managing#,Managing Jenkins>>.

For an overview of content in the Jenkins User Handbook, see
Expand Down
2 changes: 1 addition & 1 deletion content/doc/developer/handling-requests/actions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ When the SECURITY-595 fix prevents access to a URL, a warning message is written
WARNING: New Stapler routing rules result in the URL "/example" no longer being allowed. If you consider it safe to use, add the following to the whitelist: "method hudson.model.Hudson doExample". Learn more: https://www.jenkins.io/redirect/stapler-routing
----

Administrators can follow the instructions to make the method or field work on their specific instance, but ideally the component is changed to prevent the problem in the first place:
Administrators can follow the instructions to make the method or field work on their specific controller, but ideally the component is changed to prevent the problem in the first place:

* Add any of the indicators listed in the previous section that would make your method routable.
* Annotate the web method `@StaplerDispatchable`.
Expand Down
2 changes: 1 addition & 1 deletion content/doc/developer/publishing/usage-statistics.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: developersection
== Overview

Anonymous usage statistics are collected from Jenkins controllers that have not opted out from this.
They help us identify trends in Jenkins use and configuration, like the popularity of plugins and average number of plugins installed on instances.
They help us identify trends in Jenkins use and configuration, like the popularity of plugins and average number of plugins installed on controllers.

Those usage statistics are encrypted on individual Jenkins controllers and sent to the Jenkins project infrastructure, where they are stored.
Decryption and anonymization is done in one step using the https://github.com/jenkins-infra/usage-log-decrypter[Usage Log Decrypter] to ensure no private data, like private-source plugin usage information, is published.
Expand Down