Skip to content

Commit

Permalink
Merge branch 'main' into collapse-search-results-opensearch-project#7507
Browse files Browse the repository at this point in the history
  • Loading branch information
leanneeliatra authored Aug 20, 2024
2 parents 18befbb + 8403bab commit d040c7d
Show file tree
Hide file tree
Showing 28 changed files with 1,759 additions and 325 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @hdhalter @kolchfa-aws @Naarcha-AWS @vagimeli @AMoo-Miki @natebower @dlvenable @scrawfor99 @epugh
* @kolchfa-aws @Naarcha-AWS @vagimeli @AMoo-Miki @natebower @dlvenable @stephen-crawford @epugh
9 changes: 7 additions & 2 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ This document lists the maintainers in this repo. See [opensearch-project/.githu

| Maintainer | GitHub ID | Affiliation |
| ---------------- | ----------------------------------------------- | ----------- |
| Heather Halter | [hdhalter](https://github.com/hdhalter) | Amazon |
| Fanit Kolchina | [kolchfa-aws](https://github.com/kolchfa-aws) | Amazon |
| Nate Archer | [Naarcha-AWS](https://github.com/Naarcha-AWS) | Amazon |
| Nathan Bower | [natebower](https://github.com/natebower) | Amazon |
| Melissa Vagi | [vagimeli](https://github.com/vagimeli) | Amazon |
| Miki Barahmand | [AMoo-Miki](https://github.com/AMoo-Miki) | Amazon |
| David Venable | [dlvenable](https://github.com/dlvenable) | Amazon |
| Stephen Crawford | [scraw99](https://github.com/scrawfor99) | Amazon |
| Stephen Crawford | [stephen-crawford](https://github.com/stephen-crawford) | Amazon |
| Eric Pugh | [epugh](https://github.com/epugh) | OpenSource Connections |

## Emeritus

| Maintainer | GitHub ID | Affiliation |
| ---------------- | ----------------------------------------------- | ----------- |
| Heather Halter | [hdhalter](https://github.com/hdhalter) | Amazon |
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ The following resources provide important guidance regarding contributions to th

If you encounter problems or have questions when contributing to the documentation, these people can help:

- [hdhalter](https://github.com/hdhalter)
- [kolchfa-aws](https://github.com/kolchfa-aws)
- [Naarcha-AWS](https://github.com/Naarcha-AWS)
- [vagimeli](https://github.com/vagimeli)
Expand Down
8 changes: 8 additions & 0 deletions _api-reference/cluster-api/cluster-health.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ GET _cluster/health
GET _cluster/health/<index>
```

## Path parameters

The following table lists the available path parameters. All path parameters are optional.

Parameter | Data type | Description
:--- | :--- | :---
&lt;index-name&gt; | String | Limits health reporting to a specific index. Can be a single index or a comma-separated list of index names.

## Query parameters

The following table lists the available query parameters. All query parameters are optional.
Expand Down
15 changes: 9 additions & 6 deletions _api-reference/nodes-apis/nodes-stats.md
Original file line number Diff line number Diff line change
Expand Up @@ -893,24 +893,27 @@ search.suggest_total | Integer | The total number of shard suggest operations.
search.suggest_time_in_millis | Integer | The total amount of time for all shard suggest operations, in milliseconds.
search.suggest_current | Integer | The number of shard suggest operations that are currently running.
search.request | Object | Statistics about coordinator search operations for the node.
search.request.took.time_in_millis | Integer | The total amount of time taken for all search requests, in milliseconds.
search.request.took.current | Integer | The number of search requests that are currently running.
search.request.took.total | Integer | The total number of search requests completed.
search.request.dfs_pre_query.time_in_millis | Integer | The total amount of time for all coordinator depth-first search (DFS) prequery operations, in milliseconds.
search.request.dfs_pre_query.current | Integer | The number of coordinator DFS prequery operations that are currently running.
search.request.dfs_pre_query.total | Integer | The total number of coordinator DFS prequery operations.
search.request.dfs_pre_query.total | Integer | The total number of coordinator DFS prequery operations completed.
search.request.query.time_in_millis | Integer | The total amount of time for all coordinator query operations, in milliseconds.
search.request.query.current | Integer | The number of coordinator query operations that are currently running.
search.request.query.total | Integer | The total number of coordinator query operations.
search.request.query.total | Integer | The total number of coordinator query operations completed.
search.request.fetch.time_in_millis | Integer | The total amount of time for all coordinator fetch operations, in milliseconds.
search.request.fetch.current | Integer | The number of coordinator fetch operations that are currently running.
search.request.fetch.total | Integer | The total number of coordinator fetch operations.
search.request.fetch.total | Integer | The total number of coordinator fetch operations completed.
search.request.dfs_query.time_in_millis | Integer | The total amount of time for all coordinator DFS prequery operations, in milliseconds.
search.request.dfs_query.current | Integer | The number of coordinator DFS prequery operations that are currently running.
search.request.dfs_query.total | Integer | The total number of coordinator DFS prequery operations.
search.request.dfs_query.total | Integer | The total number of coordinator DFS prequery operations completed.
search.request.expand.time_in_millis | Integer | The total amount of time for all coordinator expand operations, in milliseconds.
search.request.expand.current | Integer | The number of coordinator expand operations that are currently running.
search.request.expand.total | Integer | The total number of coordinator expand operations.
search.request.expand.total | Integer | The total number of coordinator expand operations completed.
search.request.can_match.time_in_millis | Integer | The total amount of time for all coordinator match operations, in milliseconds.
search.request.can_match.current | Integer | The number of coordinator match operations that are currently running.
search.request.can_match.total | Integer | The total number of coordinator match operations.
search.request.can_match.total | Integer | The total number of coordinator match operations completed.
merges | Object | Statistics about merge operations for the node.
merges.current | Integer | The number of merge operations that are currently running.
merges.current_docs | Integer | The number of document merges that are currently running.
Expand Down
7 changes: 7 additions & 0 deletions _data-prepper/pipelines/configuration/processors/obfuscate.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ When run, the `obfuscate` processor parses the fields into the following output:

Use the following configuration options with the `obfuscate` processor.

<!--
This table is autogenerated. Do not edit it.
- name: obfuscate
- pluginType: processor
- source: https://github.com/opensearch-project/data-prepper/blob/253e59245fd9c39c959c1c8caaeff1b226a5a0ab/data-prepper-plugins/obfuscate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/obfuscation/ObfuscationProcessorConfig.java
-->

| Parameter | Required | Description |
| :--- | :--- | :--- |
| `source` | Yes | The source field to obfuscate. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Option | Required | Type | Description

### Scheduling

The `scheduling` configuration allows the user to configure how indexes are reprocessed in the source based on the the `index_read_count` and recount time `interval`.
The `scheduling` configuration allows the user to configure how indexes are reprocessed in the source based on the `index_read_count` and recount time `interval`.

For example, setting `index_read_count` to `3` with an `interval` of `1h` will result in all indexes being reprocessed 3 times, 1 hour apart. By default, indexes will only be processed once.

Expand Down
2 changes: 1 addition & 1 deletion _field-types/supported-field-types/derived.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ PUT logs
}
}
},
"client_ip": {
"clientip": {
"type": "keyword"
}
}
Expand Down
Loading

0 comments on commit d040c7d

Please sign in to comment.