-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into issue-16899
- Loading branch information
Showing
93 changed files
with
3,894 additions
and
1,119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| name: "Changelog Check" | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: | ||
| - "opened" | ||
| - "synchronize" | ||
| - "reopened" | ||
| - "edited" | ||
|
|
||
| jobs: | ||
| test: | ||
| name: "Check Changelog presence" | ||
| runs-on: "ubuntu-latest" | ||
|
|
||
| steps: | ||
| - uses: "Graylog2/actions/changelog-check@main" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| name: Request dispatched PR Build | ||
|
|
||
| on: | ||
| - pull_request | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| dispatchedPR: | ||
| name: Dispatch wait and check | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Build pull requests string | ||
| id: pr_string | ||
| shell: bash | ||
| env: | ||
| PR_BODY: "${{ github.event.pull_request.body }}" | ||
| run: | | ||
| # Add the PR that triggered this workflow | ||
| pulls=("${{ github.repository }}#${{ github.event.number }}") | ||
| # Add any PR dependencies to the list of pulls | ||
| pulls+=($(grep -P '^/(jenkins-pr-deps|jpd|prd)' <<< "$PR_BODY" | \ | ||
| grep -ioP '(Graylog2/\S+?#|https?://github.com/Graylog2/\S+?/pull/)[0-9]+' || true)) | ||
| echo "pr_string=$(tr ' ' ',' <<< "${pulls[@]}")" >> $GITHUB_OUTPUT | ||
| - name: dispatch job to graylog-project-internal | ||
| run: > | ||
| gh workflow run -R Graylog2/graylog-project-internal pr-build.yml --ref master | ||
| -f caller_repo=${{ github.repository }} | ||
| -f caller_pr_nr=${{ github.event.number }} | ||
| -f caller_base_branch=${{ github.base_ref || github.ref_name }} | ||
| -f caller_head_branch=${{ github.head_ref }} | ||
| -f head_sha=${{ github.event.pull_request.head.sha }} | ||
| -f pull_requests="${{ steps.pr_string.outputs.pr_string }}" | ||
| -f initial_actor="${{ github.actor }}/${{ github.triggering_actor }}" | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.PAT_GRAYLOG_PROJECT_INTERNAL_WORKFLOW_RW }} | ||
|
|
||
| - name: Give dispatched build time to add its status | ||
| run: sleep 20 | ||
| # This is mostly cosmetic. If this workflow finishes before the dispatched | ||
| # build creates the status on the PR, the build will show up green for a while. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| type = "fixed" | ||
| message = "Fix tooltip colors on Rule Editor." | ||
|
|
||
| issues = ["17204"] | ||
| pulls = ["17220"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| type = "added" | ||
| message = "Added 4 pipeline functions for general use that were previously only available to Illuminate." | ||
|
|
||
| issues = ["Graylog2/graylog-plugin-enterprise#6032"] | ||
| pulls = ["6112"] | ||
|
|
||
| details.user = """ | ||
| The following pipeline functions were added: | ||
| - array_contains | ||
| - array_remove | ||
| - string_array_add | ||
| - lookup_all | ||
| """ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| type = "a" | ||
| message = "Including basic data node usage information in telemetry." | ||
|
|
||
| pulls = ["17042"] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| type = "added" | ||
| message = "Add index set field type management page" | ||
|
|
||
| issues = ["17160"] | ||
| pulls = ["17070"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| type = "fixed" | ||
| message = "Fix Content pack install modal having two superposed modal element" | ||
|
|
||
| issues = ["16834", "15752"] | ||
| pulls = ["17073"] | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| type = "f" | ||
| message = "Exclude non-message streams from aggregation event searches." | ||
|
|
||
| issues = ["Graylog2/graylog-plugin-enterprise#6042"] | ||
| pulls = ["17087"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| type = "fixed" | ||
| message = "Show ignore_null configuration on lookup cache form." | ||
|
|
||
| issues = ["15200"] | ||
| pulls = ["17218"] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| type = "fixed" | ||
| message = "Fix redirect after creating contentpack revision." | ||
|
|
||
| issues = ["17071"] | ||
| pulls = ["17233"] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
...in/java/org/graylog/plugins/pipelineprocessor/functions/arrays/AbstractArrayFunction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright (C) 2020 Graylog, Inc. | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the Server Side Public License, version 1, | ||
| * as published by MongoDB, Inc. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * Server Side Public License for more details. | ||
| * | ||
| * You should have received a copy of the Server Side Public License | ||
| * along with this program. If not, see | ||
| * <http://www.mongodb.com/licensing/server-side-public-license>. | ||
| */ | ||
| package org.graylog.plugins.pipelineprocessor.functions.arrays; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import org.graylog.plugins.pipelineprocessor.ast.functions.AbstractFunction; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| abstract public class AbstractArrayFunction<T> extends AbstractFunction<T> { | ||
| @SuppressWarnings("rawtypes") | ||
| static List toList(Object obj) { | ||
| if (obj instanceof Collection) { | ||
| return ImmutableList.copyOf((Collection) obj); | ||
| } else { | ||
| throw new IllegalArgumentException("Unsupported data type for parameter 'elements': " + obj.getClass().getCanonicalName()); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.