Merge branch 'indexsetTemplates' into feat/select-index-template

changelog/unreleased/issue-18932.toml

@@ -0,0 +1,5 @@
+type="f"
+message="Fix selecting option in more results select on pipeline simulator page."
+
+issues=["18932"]
+pulls=["19413"]

data-node/pom.xml

@@ -521,7 +521,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -531,7 +531,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>

graylog2-server/pom.xml

@@ -904,7 +904,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -914,7 +914,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>

graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/pivot/MayHaveUnit.java

@@ -16,11 +16,13 @@
  */
 package org.graylog.plugins.views.search.searchtypes.pivot;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.graylog.plugins.formatting.units.model.UnitId;
 
 import java.util.Optional;
 
 public interface MayHaveUnit {
 
+    @JsonProperty
     Optional<UnitId> unit();
 }

graylog2-server/src/main/java/org/graylog2/indexer/indexset/template/IndexSetTemplateService.java

@@ -58,7 +58,7 @@ public class IndexSetTemplateService extends PaginatedDbService<IndexSetTemplate
             EntityAttribute.builder().id(ID_FIELD_NAME).type(SearchQueryField.Type.OBJECT_ID).title("Template Id").hidden(true).sortable(true).build(),
             EntityAttribute.builder().id(TITLE_FIELD_NAME).title("Template Name").sortable(true).searchable(true).build(),
             EntityAttribute.builder().id(DESCRIPTION_FIELD_NAME).title("Template Description").sortable(false).build(),
-            EntityAttribute.builder().id(BUILT_IN_FIELD_NAME).type(SearchQueryField.Type.BOOLEAN).title("Is Built-in").sortable(false).build(),
+            EntityAttribute.builder().id(BUILT_IN_FIELD_NAME).type(SearchQueryField.Type.BOOLEAN).title("Is Built-in").sortable(false).searchable(true).build(),
             EntityAttribute.builder().id(INDEX_SET_CONFIG_FIELD_NAME).title("Custom Config").sortable(false).build()
     );
 

graylog2-web-interface/packages/eslint-config-graylog/package.json

@@ -15,8 +15,8 @@
   "dependencies": {
     "@babel/eslint-parser": "7.16.5",
     "@tanstack/eslint-plugin-query": "4.36.1",
-    "@typescript-eslint/eslint-plugin": "7.9.0",
-    "@typescript-eslint/parser": "7.9.0",
+    "@typescript-eslint/eslint-plugin": "7.10.0",
+    "@typescript-eslint/parser": "7.10.0",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-import-resolver-webpack": "0.13.8",

graylog2-web-interface/src/components/indices/IndexSetTemplates/CreateTemplate.tsx

@@ -40,7 +40,7 @@ const CreateTemplate = () => {
   const onSubmit = useCallback((template: IndexSetTemplate) => {
     sendTelemetry(TELEMETRY_EVENT_TYPE.INDEX_SET_TEMPLATE.CREATED, {
       app_pathname: telemetryPathName,
-      app_action_value: 'create-new-index-set-template-created', // TODO: Add template name
+      app_action_value: 'create-new-index-set-template-created',
     });
 
     createTemplate(template).then(() => {

graylog2-web-interface/src/components/indices/IndexSetTemplates/EditTemplate.tsx

@@ -45,7 +45,7 @@ const EditTemplate = ({
     editTemplate({ template: newTemplate, id: template.id }).then(() => {
       sendTelemetry(TELEMETRY_EVENT_TYPE.INDEX_SET_TEMPLATE.EDIT, {
         app_pathname: telemetryPathName,
-        app_action_value: 'edit-new-index-set-template-edited', // TODO: add template name
+        app_action_value: 'edit-new-index-set-template-edited',
       });
 
       navigate(Routes.SYSTEM.INDICES.TEMPLATES.OVERVIEW);

graylog2-web-interface/src/components/simulator/SimulationResults.jsx

@@ -66,7 +66,7 @@ class SimulationResults extends React.Component {
     const { viewOption } = this.state;
 
     return (
-      <MenuItem key={option} eventKey={option} active={viewOption === option}>
+      <MenuItem key={option} onSelect={() => this._changeViewOptions(option)} active={viewOption === option}>
         {text}
       </MenuItem>
     );
@@ -148,7 +148,6 @@ class SimulationResults extends React.Component {
           <div className="pull-right">
             <DropdownButton id="simulation-view-options"
                             title="More results"
-                            onSelect={this._changeViewOptions}
                             bsStyle="default"
                             bsSize="small"
                             pullRight>

graylog2-web-interface/src/pages/IndexSetTemplateCreatePage.tsx

@@ -24,7 +24,9 @@ import CreateTemplate from 'components/indices/IndexSetTemplates/CreateTemplate'
 const IndexSetTemplateCreatePage = () => (
   <DocumentTitle title="Create Index Set Template">
     <IndicesPageNavigation />
-    <PageHeader title="Create Index Set Template" />
+    <PageHeader title="Create Index Set Template">
+      <span>Create a new Index Set Template. This is a set of configuration that can be applied when creating a new Index Set.</span>
+    </PageHeader>
     <Row className="content">
       <Col md={12}>
         <CreateTemplate />

graylog2-web-interface/src/pages/IndexSetTemplateEditPage.tsx

@@ -30,7 +30,9 @@ const IndexSetTemplateEditPage = () => {
   return (
     <DocumentTitle title="Edit Index Set Template">
       <IndicesPageNavigation />
-      <PageHeader title="Edit Index Set Template" />
+      <PageHeader title="Edit Index Set Template">
+        <span>Edit an existing Index Set Template. This is a set of configuration that can be applied when creating a new Index Set.</span>
+      </PageHeader>
       <Row className="content">
         <Col md={12}>
           {!isFetching ? <EditTemplate template={data} /> : <Spinner />}

graylog2-web-interface/src/pages/IndexSetTemplatesPage.tsx

@@ -28,7 +28,7 @@ const IndexSetTemplatesPage = () => (
     <PageHeader title="Index Set Templates"
                 actions={<CreateIndexSetTemplateButton />}>
       <span>
-        View and manage your Index Set Templates
+        View and manage your Index Set Templates. These allow Index Set configurations to be saved and re-used upon creating a new Index Sets.
       </span>
     </PageHeader>
 

graylog2-web-interface/yarn.lock

@@ -3305,9 +3305,9 @@
     "@types/geojson" "*"
 
 "@types/lodash@^4.14.165":
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.1.tgz#0fabfcf2f2127ef73b119d98452bd317c4a17eb8"
-  integrity sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.4.tgz#0303b64958ee070059e3a7184048a55159fe20b7"
+  integrity sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==
 
 "@types/md5@^2.3.0":
   version "2.3.5"
@@ -6565,22 +6565,22 @@ elementary-circuits-directed-graph@^1.0.4:
     strongly-connected-components "^1.0.1"
 
 embla-carousel-react@^8.0.0-rc11:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/embla-carousel-react/-/embla-carousel-react-8.0.4.tgz#3c0fa1a73bacc92e1e3d84eedfeda3b1962e524a"
-  integrity sha512-3NlOmBmRhaGhtI0It9243yg9fz2wPRML5gGLDIE69Oyb/CuGsJnxpcgG74j905NQBDgReTEfFJwzOtIFAjeBfg==
-  dependencies:
-    embla-carousel "8.0.4"
-    embla-carousel-reactive-utils "8.0.4"
-
-embla-carousel-reactive-utils@8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.0.4.tgz#e767be401d4abae25e355d0f7d113d32aa4565f9"
-  integrity sha512-7lWM+8hanIF2roTAjxwfqfr0+VTbr9rYVlAs0r5PwPOVpz1G3/+bRelgAYvwcfWVm5Vydo2pKXVfFOPQjznF7w==
-
-embla-carousel@8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/embla-carousel/-/embla-carousel-8.0.4.tgz#eff9c7e27071911dd4810317348a70aded1619a8"
-  integrity sha512-INndmilrV9KY4Wnb4F2tI55DuQnFjf3GPOaPDT2LGYiKhIWVNUhv1nz/RI7CZ6WoIZ8MYHP4t6Qm/cqpcGHknA==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/embla-carousel-react/-/embla-carousel-react-8.1.3.tgz#a07770eee003a56dfe2fa55304b48892cc00c013"
+  integrity sha512-YrezDPgxPDKa+OKMhSrwuPEU2OgF5147vFW473EWT3bx9DETV3W/RyWTxq0/2pf3M4VXkjqFNbS/W1xM8lTaVg==
+  dependencies:
+    embla-carousel "8.1.3"
+    embla-carousel-reactive-utils "8.1.3"
+
+embla-carousel-reactive-utils@8.1.3:
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.1.3.tgz#b4e7d439ab6aefb9554b14198e567e919b52f167"
+  integrity sha512-D8tAK6NRQVEubMWb+b/BJ3VvGPsbEeEFOBM6cCCwfiyfLzNlacOAt0q2dtUEA9DbGxeWkB8ExgXzFRxhGV2Hig==
+
+embla-carousel@8.1.3:
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/embla-carousel/-/embla-carousel-8.1.3.tgz#d086738ee529e59815dae4e2ecd9ee37c47ffc1a"
+  integrity sha512-GiRpKtzidV3v50oVMly8S+D7iE1r96ttt7fSlvtyKHoSkzrAnVcu8fX3c4j8Ol2hZSQlVfDqDIqdrFPs0u5TWQ==
 
 emittery@^0.13.1:
   version "0.13.1"

pom.xml

@@ -100,10 +100,10 @@
         <auto-value-javabean.version>2.5.2</auto-value-javabean.version>
         <aws-java-sdk-1.version>1.12.675</aws-java-sdk-1.version>
         <aws-java-sdk-2.version>2.25.6</aws-java-sdk-2.version>
-        <aws-kinesis-client.version>2.5.8</aws-kinesis-client.version>
+        <aws-kinesis-client.version>2.6.0</aws-kinesis-client.version>
         <aws-msk-iam-auth.version>2.1.0</aws-msk-iam-auth.version>
         <bouncycastle.version>1.78.1</bouncycastle.version>
-        <byte-buddy.version>1.14.14</byte-buddy.version>
+        <byte-buddy.version>1.14.16</byte-buddy.version>
         <caffeine.version>3.1.8</caffeine.version>
         <cef-parser.version>0.0.1.10</cef-parser.version>
         <classgraph.version>4.8.172</classgraph.version>
@@ -153,7 +153,7 @@
         <mongodb-driver.version>5.1.0</mongodb-driver.version>
         <mongojack.version>4.11.0</mongojack.version>
         <natty.version>0.13</natty.version>
-        <netty.version>4.1.109.Final</netty.version>
+        <netty.version>4.1.110.Final</netty.version>
         <netty-tcnative-boringssl-static.version>2.0.65.Final</netty-tcnative-boringssl-static.version>
         <okhttp.version>4.12.0</okhttp.version>
         <opencsv.version>2.3</opencsv.version>
@@ -177,7 +177,7 @@
         <ulid.version>8.3.0</ulid.version>
         <unboundid-ldap.version>7.0.0</unboundid-ldap.version>
         <uuid.version>3.2.1</uuid.version>
-        <validation-api.version>3.0.2</validation-api.version>
+        <validation-api.version>3.1.0</validation-api.version>
         <zstd.version>1.5.6-3</zstd.version>
         <cron-utils.version>9.2.1</cron-utils.version>
         <asciitable.version>0.3.2</asciitable.version>