Skip to content

Fix filter indexes parameter in logs search #1877

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 6, 2023
Merged

Fix filter indexes parameter in logs search #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.5",
"regenerated": "2023-07-05 21:53:53.460695",
"spec_repo_commit": "aee1c6e4"
"regenerated": "2023-07-06 20:39:48.258694",
"spec_repo_commit": "45b9e51d"
},
"v2": {
"apigentools_version": "1.6.5",
"regenerated": "2023-07-05 21:53:53.481740",
"spec_repo_commit": "aee1c6e4"
"regenerated": "2023-07-06 20:39:48.275571",
"spec_repo_commit": "45b9e51d"
}
}
}
14 changes: 10 additions & 4 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21255,15 +21255,21 @@ paths:
required: false
schema:
type: string
- description: 'For customers with multiple indexes, the indexes to search
- description: 'For customers with multiple indexes, the indexes to search.

Defaults to ''*'' which means all indexes'
example: main
example:
- main
- web
explode: false
in: query
name: filter[index]
name: filter[indexes]
required: false
schema:
type: string
items:
description: The name of a log index.
type: string
type: array
- description: Minimum timestamp for requested logs.
example: '2019-01-02T09:42:36.320Z'
in: query
Expand Down
3 changes: 2 additions & 1 deletion examples/v2/logs/ListLogsGet_2034110533.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.datadog.api.client.v2.api.LogsApi.ListLogsGetOptionalParameters;
import com.datadog.api.client.v2.model.LogsListResponse;
import java.time.OffsetDateTime;
import java.util.Collections;

public class Example {
public static void main(String[] args) {
Expand All @@ -17,7 +18,7 @@ public static void main(String[] args) {
apiInstance.listLogsGet(
new ListLogsGetOptionalParameters()
.filterQuery("datadog-agent")
.filterIndex("main")
.filterIndexes(Collections.singletonList("main"))
.filterFrom(OffsetDateTime.parse("2020-09-17T11:48:36+01:00"))
.filterTo(OffsetDateTime.parse("2020-09-17T12:48:36+01:00"))
.pageLimit(5));
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/datadog/api/client/v2/api/LogsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ public CompletableFuture<ApiResponse<LogsListResponse>> listLogsWithHttpInfoAsyn
/** Manage optional parameters to listLogsGet. */
public static class ListLogsGetOptionalParameters {
private String filterQuery;
private String filterIndex;
private List<String> filterIndexes;
private OffsetDateTime filterFrom;
private OffsetDateTime filterTo;
private LogsStorageTier filterStorageTier;
Expand All @@ -435,14 +435,14 @@ public ListLogsGetOptionalParameters filterQuery(String filterQuery) {
}

/**
* Set filterIndex.
* Set filterIndexes.
*
* @param filterIndex For customers with multiple indexes, the indexes to search Defaults to '*'
* which means all indexes (optional)
* @param filterIndexes For customers with multiple indexes, the indexes to search. Defaults to
* '*' which means all indexes (optional)
* @return ListLogsGetOptionalParameters
*/
public ListLogsGetOptionalParameters filterIndex(String filterIndex) {
this.filterIndex = filterIndex;
public ListLogsGetOptionalParameters filterIndexes(List<String> filterIndexes) {
this.filterIndexes = filterIndexes;
return this;
}

Expand Down Expand Up @@ -652,7 +652,7 @@ public ApiResponse<LogsListResponse> listLogsGetWithHttpInfo(
ListLogsGetOptionalParameters parameters) throws ApiException {
Object localVarPostBody = null;
String filterQuery = parameters.filterQuery;
String filterIndex = parameters.filterIndex;
List<String> filterIndexes = parameters.filterIndexes;
OffsetDateTime filterFrom = parameters.filterFrom;
OffsetDateTime filterTo = parameters.filterTo;
LogsStorageTier filterStorageTier = parameters.filterStorageTier;
Expand All @@ -666,7 +666,7 @@ public ApiResponse<LogsListResponse> listLogsGetWithHttpInfo(
Map<String, String> localVarHeaderParams = new HashMap<String, String>();

localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[query]", filterQuery));
localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[index]", filterIndex));
localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "filter[indexes]", filterIndexes));
localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[from]", filterFrom));
localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[to]", filterTo));
localVarQueryParams.addAll(
Expand Down Expand Up @@ -707,7 +707,7 @@ public CompletableFuture<ApiResponse<LogsListResponse>> listLogsGetWithHttpInfoA
ListLogsGetOptionalParameters parameters) {
Object localVarPostBody = null;
String filterQuery = parameters.filterQuery;
String filterIndex = parameters.filterIndex;
List<String> filterIndexes = parameters.filterIndexes;
OffsetDateTime filterFrom = parameters.filterFrom;
OffsetDateTime filterTo = parameters.filterTo;
LogsStorageTier filterStorageTier = parameters.filterStorageTier;
Expand All @@ -721,7 +721,7 @@ public CompletableFuture<ApiResponse<LogsListResponse>> listLogsGetWithHttpInfoA
Map<String, String> localVarHeaderParams = new HashMap<String, String>();

localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[query]", filterQuery));
localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[index]", filterIndex));
localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "filter[indexes]", filterIndexes));
localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[from]", filterFrom));
localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[to]", filterTo));
localVarQueryParams.addAll(
Expand Down
2 changes: 1 addition & 1 deletion ...esources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
}
]
2 changes: 1 addition & 1 deletion ...es/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e81"
"id": "01611a93-5e74-0630-3c51-f707c3b51e82"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions ...st/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15b"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15e"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15f"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15a"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15c"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e78"
"id": "01611a93-5e74-0630-3c51-f707c3b51e80"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed158"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15f"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...resources/cassettes/features/v2/Delete_a_RUM_application_returns_No_Content_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "74945625-c01a-a598-e538-65a53ceb0686"
"id": "74945625-c01a-a598-e538-65a53ceb0689"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Get_a_quick_list_of_logs_returns_OK_response.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-01-06T00:51:50.622Z
2023-07-05T20:27:06.820Z
6 changes: 3 additions & 3 deletions src/test/resources/cassettes/features/v2/Get_a_quick_list_of_logs_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"filter[query]": [
"datadog-agent"
],
"filter[index]": [
"filter[indexes]": [
"main"
],
"filter[from]": [
Expand All @@ -25,7 +25,7 @@
"secure": true
},
"httpResponse": {
"body": "{\"data\":[]}",
"body": "{\"data\":[],\"meta\":{\"elapsed\":0,\"request_id\":\"pddv1ChZVZjdFSUNKdlM3LVBKNXNPcjR6R1hnIiwKHP4qJC1KWavJCGIvcezlUg3AhhLxU4JfitQ_QFESDFVjhmcEEEIN8NN7KA\",\"status\":\"done\"}}\n",
"headers": {
"Content-Type": [
"application/json"
Expand All @@ -40,6 +40,6 @@
"timeToLive": {
"unlimited": true
},
"id": "5f11d056-b485-3829-2ace-fd53d339fc13"
"id": "36d1fbfa-3821-1bcf-903d-d47f59ab3292"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
"id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
},
{
"httpRequest": {
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e82"
"id": "01611a93-5e74-0630-3c51-f707c3b51e78"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed161"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed158"
},
{
"httpRequest": {
Expand All @@ -79,7 +79,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e83"
"id": "01611a93-5e74-0630-3c51-f707c3b51e79"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...st/resources/cassettes/features/v2/List_all_the_RUM_applications_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "74945625-c01a-a598-e538-65a53ceb0687"
"id": "74945625-c01a-a598-e538-65a53ceb0686"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
"id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb892173"
"id": "ab2c08c1-60c7-9278-3246-d650bb892175"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15e"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
"id": "01611a93-5e74-0630-3c51-f707c3b51e83"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15a"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed161"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Revoke_permission_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb892174"
"id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
"id": "ab2c08c1-60c7-9278-3246-d650bb892173"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb892172"
"id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15c"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed159"
},
{
"httpRequest": {
Expand Down
Loading