Skip to content

Commit 81d1365

Browse files
Merge branch 'main' into fix-osquery-labels
2 parents f87271c + 383239e commit 81d1365

163 files changed

Lines changed: 2939 additions & 1024 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/ftr_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ enabled:
6868
- test/functional/apps/dashboard/group3/config.ts
6969
- test/functional/apps/dashboard/group4/config.ts
7070
- test/functional/apps/dashboard/group5/config.ts
71+
- test/functional/apps/dashboard/group6/config.ts
7172
- test/functional/apps/discover/config.ts
7273
- test/functional/apps/getting_started/config.ts
7374
- test/functional/apps/home/config.ts
Lines changed: 22 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,191 +1,43 @@
11
[[managing-licenses]]
22
== License Management
33

4-
When you install the default distribution of {kib}, you receive free features
5-
with no expiration date. For the full list of features, refer to
6-
{subscriptions}.
4+
By default, new installations have a Basic license that never expires.
5+
For the full list of features available at the Free and Open Basic subscription level,
6+
refer to {subscriptions}.
77

8-
If you want to try out the full set of features, you can activate a free 30-day
9-
trial. To view the status of your license, start a trial, or install a new
10-
license, open the main menu, then click *Stack Management > License Management*.
11-
12-
NOTE: You can start a trial only if your cluster has not already activated a
13-
trial license for the current major product version. For example, if you have
14-
already activated a trial for 6.0, you cannot start a new trial until
15-
7.0. You can, however, request an extended trial at {extendtrial}.
16-
17-
When you activate a new license level, new features appear in *Stack Management*.
18-
19-
[role="screenshot"]
20-
image::images/management-license.png[]
8+
To explore all of the available solutions and features, start a 30-day free trial.
9+
You can activate a trial subscription once per major product version.
10+
If you need more than 30 days to complete your evaluation,
11+
request an extended trial at {extendtrial}.
2112

22-
At the end of the trial period, some features operate in a
23-
<<license-expiration,degraded mode>>. You can revert to Basic, extend the trial,
24-
or purchase a subscription.
25-
26-
TIP: If {security-features} are enabled, unless you have a trial license,
27-
you must configure Transport Layer Security (TLS) in {es}.
28-
See {ref}/encrypting-communications.html[Encrypting communications].
29-
{kib} and the {ref}/start-basic.html[start basic API] provide a list of all of
30-
the features that will no longer be supported if you revert to a basic license.
13+
To view the status of your license, start a trial, or install a new
14+
license, open the main menu, then click *Stack Management > License Management*.
3115

32-
[float]
16+
[discrete]
3317
=== Required permissions
3418

3519
The `manage` cluster privilege is required to access *License Management*.
3620

3721
To add the privilege, open the main menu, then click *Stack Management > Roles*.
3822

39-
[discrete]
40-
[[update-license]]
41-
=== Update your license
42-
43-
You can update your license at runtime without shutting down your {es} nodes.
44-
License updates take effect immediately. The license is provided as a _JSON_
45-
file that you install in {kib} or by using the
46-
{ref}/update-license.html[update license API].
47-
48-
TIP: If you are using a basic or trial license, {security-features} are disabled
49-
by default. In all other licenses, {security-features} are enabled by default;
50-
you must secure the {stack} or disable the {security-features}.
51-
5223
[discrete]
5324
[[license-expiration]]
5425
=== License expiration
5526

56-
Your license is time based and expires at a future date. If you're using
57-
{monitor-features} and your license will expire within 30 days, a license
58-
expiration warning is displayed prominently. Warnings are also displayed on
59-
startup and written to the {es} log starting 30 days from the expiration date.
60-
These error messages tell you when the license expires and what features will be
61-
disabled if you do not update the license.
62-
63-
IMPORTANT: You should update your license as soon as possible. You are
64-
essentially flying blind when running with an expired license. Access to the
65-
cluster health and stats APIs is critical for monitoring and managing an {es}
66-
cluster.
67-
68-
[discrete]
69-
[[expiration-beats]]
70-
==== Beats
71-
72-
* Beats will continue to poll centrally-managed configuration.
73-
74-
[discrete]
75-
[[expiration-elasticsearch]]
76-
==== {es}
77-
78-
// Upgrade API is disabled
79-
* The deprecation API is disabled.
80-
* SQL support is disabled.
81-
* Aggregations provided by the analytics plugin are no longer usable.
82-
* All searchable snapshots indices are unassigned and cannot be searched.
83-
84-
[discrete]
85-
[[expiration-watcher]]
86-
==== {stack} {alert-features}
87-
88-
* The PUT and GET watch APIs are disabled. The DELETE watch API continues to work.
89-
* Watches execute and write to the history.
90-
* The actions of the watches do not execute.
91-
92-
[discrete]
93-
[[expiration-graph]]
94-
==== {stack} {graph-features}
95-
96-
* Graph explore APIs are disabled.
97-
98-
[discrete]
99-
[[expiration-ml]]
100-
==== {stack} {ml-features}
27+
Licenses are valid for a specific time period.
28+
30 days before the license expiration date, {es} starts logging expiration warnings.
29+
If monitoring is enabled, expiration warnings are displayed prominently in {kib}.
10130

102-
* APIs to create {anomaly-jobs}, open jobs, send data to jobs, create {dfeeds},
103-
and start {dfeeds} are disabled.
104-
* All started {dfeeds} are stopped.
105-
* All open {anomaly-jobs} are closed.
106-
* APIs to create and start {dfanalytics-jobs} are disabled.
107-
* Existing {anomaly-job} and {dfanalytics-job} results continue to be available
108-
by using {kib} or APIs.
31+
If your license expires, your subscription level reverts to Basic and
32+
you will no longer be able to use https://www.elastic.co/subscriptions[Platinum or Enterprise features].
10933

11034
[discrete]
111-
[[expiration-monitoring]]
112-
==== {stack} {monitor-features}
113-
114-
* The agent stops collecting cluster and indices metrics.
115-
* The agent stops automatically cleaning indices older than
116-
`xpack.monitoring.history.duration`.
117-
118-
[discrete]
119-
[[expiration-security]]
120-
==== {stack} {security-features}
121-
122-
* Cluster health, cluster stats, and indices stats operations are blocked.
123-
* All data operations (read and write) continue to work.
124-
125-
Once the license expires, calls to the cluster health, cluster stats, and index
126-
stats APIs fail with a `security_exception` and return a 403 HTTP status code.
127-
128-
[source,sh]
129-
-----------------------------------------------------
130-
{
131-
"error": {
132-
"root_cause": [
133-
{
134-
"type": "security_exception",
135-
"reason": "current license is non-compliant for [security]",
136-
"license.expired.feature": "security"
137-
}
138-
],
139-
"type": "security_exception",
140-
"reason": "current license is non-compliant for [security]",
141-
"license.expired.feature": "security"
142-
},
143-
"status": 403
144-
}
145-
-----------------------------------------------------
146-
147-
This message enables automatic monitoring systems to easily detect the license
148-
failure without immediately impacting other users.
149-
150-
[discrete]
151-
[[expiration-logstash]]
152-
==== {ls} pipeline management
153-
154-
* Cannot create new pipelines or edit or delete existing pipelines from the UI.
155-
* Cannot list or view existing pipelines from the UI.
156-
* Cannot run Logstash instances which are registered to listen to existing pipelines.
157-
//TBD: * Logstash will continue to poll centrally-managed pipelines
158-
159-
[discrete]
160-
[[expiration-kibana]]
161-
==== {kib}
162-
163-
* Users can still log into {kib}.
164-
* {kib} works for data exploration and visualization, but some features
165-
are disabled.
166-
* The license management UI is available to easily upgrade your license. See
167-
<<update-license>> and <<managing-licenses>>.
168-
169-
[discrete]
170-
[[expiration-reporting]]
171-
==== {kib} {report-features}
172-
173-
* Reporting is no longer available in {kib}.
174-
* Report generation URLs stop working.
175-
* Existing reports are no longer accessible.
176-
177-
[discrete]
178-
[[expiration-rollups]]
179-
==== {rollups-cap}
180-
181-
* {rollup-jobs-cap} cannot be created or started.
182-
* Existing {rollup-jobs} can be stopped and deleted.
183-
* The get rollup caps and rollup search APIs continue to function.
35+
[[update-license]]
36+
=== Update your license
18437

185-
[discrete]
186-
[[expiration-transforms]]
187-
==== {transforms-cap}
38+
Licenses are provided as a _JSON_ file and have an effective date and an expiration date.
39+
You cannot install a new license before its effective date.
40+
License updates take effect immediately and do not require restarting {es}.
18841

189-
* {transforms-cap} cannot be created, previewed, started, or updated.
190-
* Existing {transforms} can be stopped and deleted.
191-
* Existing {transform} results continue to be available.
42+
You can update your license from *Stack Management > License Management* or through the
43+
{ref}/update-license.html[update license API].

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"cover:report": "nyc report --temp-dir target/kibana-coverage/functional --report-dir target/coverage/report --reporter=lcov && open ./target/coverage/report/lcov-report/index.html",
4848
"debug": "node --nolazy --inspect scripts/kibana --dev",
4949
"debug-break": "node --nolazy --inspect-brk scripts/kibana --dev",
50+
"dev-docs": "scripts/dev_docs.sh",
5051
"docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
5152
"es": "node scripts/es",
5253
"preinstall": "node ./preinstall_check",
@@ -109,7 +110,7 @@
109110
"@elastic/datemath": "5.0.3",
110111
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.2.0-canary.2",
111112
"@elastic/ems-client": "8.3.2",
112-
"@elastic/eui": "55.1.2",
113+
"@elastic/eui": "55.1.3",
113114
"@elastic/filesaver": "1.1.2",
114115
"@elastic/node-crypto": "1.2.1",
115116
"@elastic/numeral": "^2.5.1",

packages/kbn-doc-links/src/get_doc_links.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
125125
apiKeys: `${WORKPLACE_SEARCH_DOCS}workplace-search-api-authentication.html`,
126126
box: `${WORKPLACE_SEARCH_DOCS}workplace-search-box-connector.html`,
127127
confluenceCloud: `${WORKPLACE_SEARCH_DOCS}workplace-search-confluence-cloud-connector.html`,
128+
confluenceCloudConnectorPackage: `${WORKPLACE_SEARCH_DOCS}confluence-cloud.html`,
128129
confluenceServer: `${WORKPLACE_SEARCH_DOCS}workplace-search-confluence-server-connector.html`,
130+
customConnectorPackage: `${WORKPLACE_SEARCH_DOCS}custom-connector-package.html`,
129131
customSources: `${WORKPLACE_SEARCH_DOCS}workplace-search-custom-api-sources.html`,
130132
customSourcePermissions: `${WORKPLACE_SEARCH_DOCS}workplace-search-custom-api-sources.html#custom-api-source-document-level-access-control`,
131133
documentPermissions: `${WORKPLACE_SEARCH_DOCS}workplace-search-sources-document-permissions.html`,
@@ -139,7 +141,9 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
139141
indexingSchedule: `${WORKPLACE_SEARCH_DOCS}workplace-search-customizing-indexing-rules.html#_indexing_schedule`,
140142
jiraCloud: `${WORKPLACE_SEARCH_DOCS}workplace-search-jira-cloud-connector.html`,
141143
jiraServer: `${WORKPLACE_SEARCH_DOCS}workplace-search-jira-server-connector.html`,
144+
networkDrive: `${WORKPLACE_SEARCH_DOCS}network-drives.html`,
142145
oneDrive: `${WORKPLACE_SEARCH_DOCS}workplace-search-onedrive-connector.html`,
146+
outlook: `${WORKPLACE_SEARCH_DOCS}microsoft-outlook.html`,
143147
permissions: `${WORKPLACE_SEARCH_DOCS}workplace-search-permissions.html#organizational-sources-private-sources`,
144148
salesforce: `${WORKPLACE_SEARCH_DOCS}workplace-search-salesforce-connector.html`,
145149
security: `${WORKPLACE_SEARCH_DOCS}workplace-search-security.html`,
@@ -148,7 +152,9 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
148152
sharePointServer: `${WORKPLACE_SEARCH_DOCS}sharepoint-server.html`,
149153
slack: `${WORKPLACE_SEARCH_DOCS}workplace-search-slack-connector.html`,
150154
synch: `${WORKPLACE_SEARCH_DOCS}workplace-search-customizing-indexing-rules.html`,
155+
teams: `${WORKPLACE_SEARCH_DOCS}microsoft-teams.html`,
151156
zendesk: `${WORKPLACE_SEARCH_DOCS}workplace-search-zendesk-connector.html`,
157+
zoom: `${WORKPLACE_SEARCH_DOCS}zoom.html`,
152158
},
153159
metricbeat: {
154160
base: `${ELASTIC_WEBSITE_URL}guide/en/beats/metricbeat/${DOC_LINK_VERSION}`,

packages/kbn-doc-links/src/types.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ export interface DocLinks {
111111
readonly apiKeys: string;
112112
readonly box: string;
113113
readonly confluenceCloud: string;
114+
readonly confluenceCloudConnectorPackage: string;
114115
readonly confluenceServer: string;
116+
readonly customConnectorPackage: string;
115117
readonly customSources: string;
116118
readonly customSourcePermissions: string;
117119
readonly documentPermissions: string;
@@ -125,7 +127,9 @@ export interface DocLinks {
125127
readonly indexingSchedule: string;
126128
readonly jiraCloud: string;
127129
readonly jiraServer: string;
130+
readonly networkDrive: string;
128131
readonly oneDrive: string;
132+
readonly outlook: string;
129133
readonly permissions: string;
130134
readonly salesforce: string;
131135
readonly security: string;
@@ -134,7 +138,9 @@ export interface DocLinks {
134138
readonly sharePointServer: string;
135139
readonly slack: string;
136140
readonly synch: string;
141+
readonly teams: string;
137142
readonly zendesk: string;
143+
readonly zoom: string;
138144
};
139145
readonly heartbeat: {
140146
readonly base: string;

0 commit comments

Comments
 (0)