From 85435e9937723a79c36596b196d29ac9197079c2 Mon Sep 17 00:00:00 2001 From: Supplementing Date: Mon, 23 Mar 2026 15:02:56 -0600 Subject: [PATCH 1/6] add support for var groups at other levels --- .DS_Store | Bin 0 -> 8196 bytes .buildkite/.DS_Store | Bin 0 -> 6148 bytes .github/.DS_Store | Bin 0 -> 6148 bytes code/.DS_Store | Bin 0 -> 6148 bytes compliance/.DS_Store | Bin 0 -> 6148 bytes spec/.DS_Store | Bin 0 -> 6148 bytes spec/changelog.yml | 3 +++ spec/input/manifest.spec.yml | 8 ++++++++ spec/integration/manifest.spec.yml | 8 ++++++++ test/.DS_Store | Bin 0 -> 6148 bytes 10 files changed, 19 insertions(+) create mode 100644 .DS_Store create mode 100644 .buildkite/.DS_Store create mode 100644 .github/.DS_Store create mode 100644 code/.DS_Store create mode 100644 compliance/.DS_Store create mode 100644 spec/.DS_Store create mode 100644 test/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8417db06cca56c9e415a264160a735b3dd01e745 GIT binary patch literal 8196 zcmeHMJ!lj`6n>Li$=yZd3c(O?(mEd5n04S6d_=h zP7Kunw0qz(;4tX?A7ayZm$7<`Dx?kFa?LpS2$5Pc`KEE#6lVx~Acnm)giu!(yi~3E6<)8m_#!bk*b}gG!YY zqbxnN9P7D218Pza=PfN;4;?gm7=r7$c;my=$Eq45smDU4dWuoD9<|zTOJ|RzrLy-6 zv@kE%vHs-UVWY!Bq#E)O7Jns>`S5ZxQG0xk`#ATlsb|;Cm?W`bFJ;d2TfDn&OWvyD z4XKa!rbDx|fbaHbl;5ru;kcgFhdbhVn%gJWwi(vax&4jQ>0y@iplx7{4(&X`eO%9; zmF4(7PGY%+Jio=OH}8>{mrkkK+QzA1NVB$z(lw|kKypp{?ohLeBreic zh2W;jaadK3!zOPtb7ms?i`-Yq&oF=rT1wGI` z)%4iUA^jM7?B-ECw|VsTDXZ^X_Iq{n@fTMP#KjqK1`eJ9)NGODRMAIgz!`7`S_b6% z5TJsYVWSv79T;K@035>{1#{^oBqkVUhK(XtAgrN44P|RFSi@lt=9d{ZiW*LA%?I0^ z**X-CcgOxAx)W!LJ~{)=K$n3dy_`z@zuw>fcZ2-O8E^&;iUA(yMLxqLS#2FWoYdL? ry@iU1U!&NDU=m9)e5DkhL8HJPWCF|#8%0S5dOC9Aw`iMJubdM-ykjNp`ajC&q^&S*pQ+~JqDl3HxLg#if6%--|Q^? zG11~hip-RmZ!!3sKj{J;00~vF(Wa>pnHQ}{BYI@gg*65^!wCjB!f_?q z9NWl%oZTLV81Z+?lUttOA$oF_)2r_2qR3}jeDb&{J}68nivDd zfHANQ46tX5Bs+>`jR9l87+5eM-v>_>Oe2%N;uL| zps{4nt=F@wo8o*H5uLxRW+JVKG;l+CwJ$!IKHmd$TVcdzV zW!S7|iywT?_e0k$H^UNj&BMpl{pbGu_Q2_f)!Du6^U-+VMk+uBsKB=Z_I*fj!(6ch`lkcIM*yJx#=GI!X9-}k1Ta@Dfylr#sKB6V9WgZM z$fsJDE0(~Zi~7wtr{1h}LQ%gR`Q+uIIgpVGP=QkgE@IhQ|G$Hung35oTu}ik@UIlm zX}9R+c%|A~M=xi+Ho+g^2ScrwBX}zYdMn1lTJgBu`B$R7dIg+>Mb GLV+*ea3|sb literal 0 HcmV?d00001 diff --git a/compliance/.DS_Store b/compliance/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6d8335d3f15377280409843ea7b5e8cdf65537e3 GIT binary patch literal 6148 zcmeHKOHRW;4E3}Xq_F7_wzci?$! zrA?C}RtS(Sd0yhNXPh@t921cnFY}maL_`sku{XrfAw198lAc<4(uFmabWhjxFuRSj zmbV#xBLi}{H#oHkEoklhuF7IA2_GcDh&FtRGEJwma>{c@$2%7vFRy3ae)+fj=67+n z+Vc@hVb2A>O&If#-Gtw(+GqFVxyxrgulJ|7elgU%Hr6W2RbF5DHS*d!<-AOc0b{@z z`0EUyX0t^5f;Jih#(*(UGr->m4`oagE5Y#Tzz|vh-~i?zxaMAhW4vObSP5bV;v^I( zp-x*2C*iPr^-B~hK?x_P&4<&SopvZL?2h$)a3_}t+Gq?I15F0{ay#Psf4;r{ZwA?& zF<=b*D+b&k&C)R*No#BC;ked%=p~ee{VKsa1Q($c!cL}vH5#v6 ziQ&W?^P%cRim9NOlhfkEsb{AZiu2yFf9Tc8MS|8F1I9p}fem?VaQ;6jumAH#_GAng z1OJKvSBcN#HeN|{YvJWM*M?|aG#1uN1y?2*_*4vCPR0E1h!@OxQvXU+OOG<^6MY#_ORyUEFhJO zGvEw31I~am@FNW1&Zbo7hTb~^&VVy;WPs;GKqJPCgJC*4(4`Up$Y*pC=&U6e6Een( zgCQ&swNRjiYA!L76`8?jW0qq`*Lcf6u1p4R^fC0~ui)1u=pbo#7 WaWG^S&ZlsoKLipX-Z=xmz`!TUIxj;2 literal 0 HcmV?d00001 From 8ee00a9286fd33be9d97707b09d782a6987074ba Mon Sep 17 00:00:00 2001 From: Supplementing Date: Mon, 23 Mar 2026 15:13:26 -0600 Subject: [PATCH 2/6] added test package --- .DS_Store | Bin 8196 -> 8196 bytes code/.DS_Store | Bin 6148 -> 6148 bytes code/go/pkg/validator/validator_test.go | 1 + test/.DS_Store | Bin 6148 -> 6148 bytes test/packages/good_var_groups/manifest.yml | 52 +++++++++++ .../good_var_groups_input/LICENSE.txt | 1 + .../agent/input/input.yml.hbs | 9 ++ .../good_var_groups_input/changelog.yml | 6 ++ .../good_var_groups_input/docs/README.md | 3 + .../fields/base-fields.yml | 12 +++ .../good_var_groups_input/img/sample-logo.svg | 1 + .../good_var_groups_input/manifest.yml | 86 ++++++++++++++++++ 12 files changed, 171 insertions(+) create mode 100644 test/packages/good_var_groups_input/LICENSE.txt create mode 100644 test/packages/good_var_groups_input/agent/input/input.yml.hbs create mode 100644 test/packages/good_var_groups_input/changelog.yml create mode 100644 test/packages/good_var_groups_input/docs/README.md create mode 100644 test/packages/good_var_groups_input/fields/base-fields.yml create mode 100644 test/packages/good_var_groups_input/img/sample-logo.svg create mode 100644 test/packages/good_var_groups_input/manifest.yml diff --git a/.DS_Store b/.DS_Store index 8417db06cca56c9e415a264160a735b3dd01e745..332ffb28bd06c3c85968e9cdcec4a4ef28fd4393 100644 GIT binary patch delta 86 zcmZp1XmQwZPJpRKVe$n53D&qn?^r%gek&jiW$_BiGG5rMEx3n~@!IAWLi?DQe03(T X5RGCwz%V&LOk}f!SRXrv&>Kbooa7$1 delta 86 zcmZp1XmQwZPJl_^|Ktk-60DV2fhFR delta 21 dcmZoMXfc?O%(!SWBcuAnZVARk8n+a delta 56 zcmZoMXffEJ$H*kdKG}d#fkUxh-Sh2^^I>(^b diff --git a/test/packages/good_var_groups/manifest.yml b/test/packages/good_var_groups/manifest.yml index cf7fb4e11..e441dc13b 100644 --- a/test/packages/good_var_groups/manifest.yml +++ b/test/packages/good_var_groups/manifest.yml @@ -87,6 +87,35 @@ policy_templates: description: Collect sample logs and metrics data_streams: - findings + vars: + - name: username + type: text + title: Username + show_user: true + - name: password + type: password + title: Password + show_user: true + secret: true + - name: token + type: password + title: API Token + show_user: true + secret: true + var_groups: + - name: auth_method + title: Authentication Method + selector_title: Authentication method + options: + - name: basic + title: Basic Auth + vars: + - username + - password + - name: token + title: Token Auth + vars: + - token inputs: - type: httpjson title: Collect via API @@ -98,6 +127,29 @@ policy_templates: title: API URL show_user: true required: true + - name: bearer_token + type: password + title: Bearer Token + show_user: true + secret: true + - name: api_key + type: password + title: API Key + show_user: true + secret: true + var_groups: + - name: auth_method + title: Authentication + selector_title: Authentication method + options: + - name: bearer + title: Bearer Token + vars: + - bearer_token + - name: api_key + title: API Key + vars: + - api_key - type: aws-s3 title: Collect from S3 description: Collecting logs from AWS S3 bucket diff --git a/test/packages/good_var_groups_input/LICENSE.txt b/test/packages/good_var_groups_input/LICENSE.txt new file mode 100644 index 000000000..3d74f227e --- /dev/null +++ b/test/packages/good_var_groups_input/LICENSE.txt @@ -0,0 +1 @@ +Apache License 2.0 diff --git a/test/packages/good_var_groups_input/agent/input/input.yml.hbs b/test/packages/good_var_groups_input/agent/input/input.yml.hbs new file mode 100644 index 000000000..b3ac63a0b --- /dev/null +++ b/test/packages/good_var_groups_input/agent/input/input.yml.hbs @@ -0,0 +1,9 @@ +data_stream: + dataset: {{data_stream.dataset}} +paths: +{{#each paths as |path i|}} + - {{path}} +{{/each}} +exclude_files: [".gz$"] +processors: + - add_locale: ~ diff --git a/test/packages/good_var_groups_input/changelog.yml b/test/packages/good_var_groups_input/changelog.yml new file mode 100644 index 000000000..e00f88133 --- /dev/null +++ b/test/packages/good_var_groups_input/changelog.yml @@ -0,0 +1,6 @@ +# newer versions go on top +- version: "0.0.1" + changes: + - description: Initial draft of the package + type: enhancement + link: https://github.com/elastic/integrations/pull/1 diff --git a/test/packages/good_var_groups_input/docs/README.md b/test/packages/good_var_groups_input/docs/README.md new file mode 100644 index 000000000..ce8ce874b --- /dev/null +++ b/test/packages/good_var_groups_input/docs/README.md @@ -0,0 +1,3 @@ +# Good Var Groups Input Package + +This is a test package demonstrating valid `var_groups` usage in an input package at the package root and policy template levels. diff --git a/test/packages/good_var_groups_input/fields/base-fields.yml b/test/packages/good_var_groups_input/fields/base-fields.yml new file mode 100644 index 000000000..7c798f453 --- /dev/null +++ b/test/packages/good_var_groups_input/fields/base-fields.yml @@ -0,0 +1,12 @@ +- name: data_stream.type + type: constant_keyword + description: Data stream type. +- name: data_stream.dataset + type: constant_keyword + description: Data stream dataset. +- name: data_stream.namespace + type: constant_keyword + description: Data stream namespace. +- name: '@timestamp' + type: date + description: Event timestamp. diff --git a/test/packages/good_var_groups_input/img/sample-logo.svg b/test/packages/good_var_groups_input/img/sample-logo.svg new file mode 100644 index 000000000..6268dd88f --- /dev/null +++ b/test/packages/good_var_groups_input/img/sample-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/packages/good_var_groups_input/manifest.yml b/test/packages/good_var_groups_input/manifest.yml new file mode 100644 index 000000000..26c4dd073 --- /dev/null +++ b/test/packages/good_var_groups_input/manifest.yml @@ -0,0 +1,86 @@ +format_version: 3.6.0 +name: good_var_groups_input +title: Good Var Groups Input Package +description: This package demonstrates valid var_groups usage in an input package. +version: 0.0.1 +type: input +source: + license: "Apache-2.0" +conditions: + kibana: + version: "^8.10.0" + elastic: + subscription: "basic" +icons: + - src: /img/sample-logo.svg + title: Sample logo + size: 32x32 + type: image/svg+xml +vars: + - name: access_key + type: text + title: Access Key + show_user: true + secret: false + - name: secret_key + type: password + title: Secret Key + show_user: true + secret: true + - name: iam_role + type: text + title: IAM Role ARN + show_user: true +var_groups: + - name: credential_type + title: Credential Type + selector_title: Preferred method + options: + - name: access_key + title: Access Key + vars: + - access_key + - secret_key + - name: iam_role + title: IAM Role + vars: + - iam_role +policy_templates: + - name: logs + type: logs + title: Logs + description: Collect logs. + input: logfile + template_path: input.yml.hbs + vars: + - name: username + type: text + title: Username + show_user: true + - name: password + type: password + title: Password + show_user: true + secret: true + - name: token + type: password + title: API Token + show_user: true + secret: true + var_groups: + - name: auth_method + title: Authentication Method + selector_title: Authentication method + options: + - name: basic + title: Basic Auth + vars: + - username + - password + - name: token + title: Token Auth + vars: + - token +owner: + github: elastic/ecosystem + type: elastic From 696a450415797dd2a0c10dcd2503b0bb709ce849 Mon Sep 17 00:00:00 2001 From: Supplementing Date: Tue, 24 Mar 2026 08:40:52 -0600 Subject: [PATCH 3/6] fixed placeholder and changed ordering of removal per coderabbit comment --- .DS_Store | Bin 8196 -> 8196 bytes spec/changelog.yml | 2 +- spec/integration/manifest.spec.yml | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.DS_Store b/.DS_Store index 332ffb28bd06c3c85968e9cdcec4a4ef28fd4393..0d191b1f5f97a947fb6163d25ac8a754bdb78957 100644 GIT binary patch delta 78 zcmZp1XmQwZPJroB%;XCK60Eh++18&XzZH;Xy}mmO$l?{0VLGd@SzC~Wh4J`g15pXK U3B{Y=*0J@~ delta 78 zcmZp1XmQwZPJpRKVe$n53D&qn?^r%gek&jiW$_BiFrB`zSzC~Wh4I{E15pXKuTqsW Q-|pD#C;E^bU1S>*0LuFxJ^%m! diff --git a/spec/changelog.yml b/spec/changelog.yml index 218e335b9..870f31963 100644 --- a/spec/changelog.yml +++ b/spec/changelog.yml @@ -26,7 +26,7 @@ link: https://github.com/elastic/package-spec/issues/1054 - description: Add var_groups support to policy template and input levels in integration packages, and to policy template and package root levels in input packages. type: enhancement - link: https://github.com/elastic/package-spec/pull/PLACEHOLDER + link: https://github.com/elastic/package-spec/pull/1120 - description: Allow to set time series index mode in input packages. type: enhancement link: https://github.com/elastic/package-spec/pull/1066 diff --git a/spec/integration/manifest.spec.yml b/spec/integration/manifest.spec.yml index a85571ee6..5b4589a89 100644 --- a/spec/integration/manifest.spec.yml +++ b/spec/integration/manifest.spec.yml @@ -974,8 +974,6 @@ versions: - op: remove path: "/definitions/deprecated" # Switchable variable groups. - - op: remove - path: "/definitions/var_groups" - op: remove path: "/properties/var_groups" - op: remove @@ -984,6 +982,8 @@ versions: path: "/properties/policy_templates/items/properties/inputs/items/properties/var_groups" - op: remove path: "/properties/policy_templates/items/properties/inputs/items/properties/hide_in_var_group_options" + - op: remove + path: "/definitions/var_groups" # Input migration. - op: remove path: "/properties/policy_templates/items/properties/inputs/items/properties/migrate_from" From 2365b69d5f1dafa83bda00106523de3d7935859d Mon Sep 17 00:00:00 2001 From: Supplementing Date: Wed, 25 Mar 2026 10:06:18 -0600 Subject: [PATCH 4/6] Remove accidental .DS_Store files from repository Co-Authored-By: Claude Sonnet 4.6 --- .DS_Store | Bin 8196 -> 0 bytes .buildkite/.DS_Store | Bin 6148 -> 0 bytes .github/.DS_Store | Bin 6148 -> 0 bytes code/.DS_Store | Bin 6148 -> 0 bytes compliance/.DS_Store | Bin 6148 -> 0 bytes spec/.DS_Store | Bin 6148 -> 0 bytes test/.DS_Store | Bin 6148 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 .buildkite/.DS_Store delete mode 100644 .github/.DS_Store delete mode 100644 code/.DS_Store delete mode 100644 compliance/.DS_Store delete mode 100644 spec/.DS_Store delete mode 100644 test/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 0d191b1f5f97a947fb6163d25ac8a754bdb78957..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMziSjh6n>Li$=yXHg%xy>G)u@IF-EJP6w ztn9?#A0RN_hx2y-`wsRo2cjv?7qvs_vZWZ&CJfdIRFsT z%k@csF#ssyMRs%qZyAmJbfwymelmepU_L+_>aYkcxCo6@w0&R|unJfOtO8a6tH9r& z0Pfk;iaGnf^4hyqz$)-xDnRcC7ca7&wxP1})qyuz0-$y9v26Gm>j0VKYU^nmDl1d5 zPgOk#oho#RAyhj0T?$9*X&Wl5(m|+n5E@zN3PnhC%yVTp2v1piw+dJV(h5-RUWRd~ z!ZOzFtbT9LPtMc=zoSwX4(G-BL8Ve{2UYYJUsUfL=|5RNksn+C<=9S>;j2aOAkTR^ zT`;(D1#65B0iU(3pEJvyrp6CfrFY4i{N}N-~Kf9xh%(s_!vNH}Ci82BZR^l&nj7+rhMeH{Dl)XQ6XOyXQV8d-h= zch7yoElXScWc&5gV`&S&NEuG3$mbwi^%&?o1%Rjk2t=Ud|G;4BG{ zTh|yJ*nOP)IG?@udeJ(Lb2*1Bzk#bZ?~w=>&dJ%@#8W{Z=1dlao5&(3l5;xnAm)@C zoy?uBqfNeY9y`dggB)uH!@}!zsgw3`PQC7Gzx`CMr8t-CwDB<>*Vu314o_g$I6ib< z+BM&6;^CP?+{bYr?Y|biQ{r5Xo8{-YL*?g$Tg27hfD4G+!uhc@I6q)ED~9tpx%#Ex zm*oGS>WlOFSsdr3zdI5)+qPeUf`S;M`u|k^`TzD4u?SWHtH2*qKsc3|$~403+B!vq zYHb&<^LSCCxKLS{f;U-?qm|`2+V}@U{On>V<#^hL%Hk7jzx^OUe+$Xjcj7(T?*DRV M?EWuh_&0Aq044?fR{#J2 diff --git a/.buildkite/.DS_Store b/.buildkite/.DS_Store deleted file mode 100644 index 473bc0594e01f85160b6306b763cb5b296f5732e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKK~BR!475v8gShm_ai2ggT)2cPJOJebsI5d%8zrJ}&ja8)h#&9+Ucn<6udUD| zRNN4%?8-YEuf1_*qqrs_o;@v7qA3w2P{Gj&h95-MMF%o6i!5^7W4pOai$zt|17A1% zPX^@dj%h^|erxKT-{i8pT2^^J-&Av0lh>Ptb7ms?i`-Yq&oF=rT1wGI` z)%4iUA^jM7?B-ECw|VsTDXZ^X_Iq{n@fTMP#KjqK1`eJ9)NGODRMAIgz!`7`S_b6% z5TJsYVWSv79T;K@035>{1#{^oBqkVUhK(XtAgrN44P|RFSi@lt=9d{ZiW*LA%?I0^ z**X-CcgOxAx)W!LJ~{)=K$n3dy_`z@zuw>fcZ2-O8E^&;iUA(yMLxqLS#2FWoYdL? ry@iU1U!&NDU=m9)e5DkhL8HJPWCF|#8%0S5dOC9Aw`iMJubdM-ykjNp`ajC&q^&S*pQ+~JqDl3HxLg#if6%--|Q^? zG11~hip-RmZ!!3sKj{J;00~vF(Wa>pnHQ}{BYI@gg*65^!wCjB!f_?q z9NWl%oZTLV81Z+?lUttOA$oF_)2r_2qR3}jeDb&{J}68nivDd zfHANQ46tX5Bs+>`jR9l87+5eM-v>_>Oe2ZUlKMMUQ>tC>hEA`RS7UM-Bx_RU8&shKHI?Tn|P-+HcndmmN*o-po2 z)-r6?v&9d-=lh}SmYZRTy5`~I>i%=LzddmJVRd$I`+RiXbpeG&1*iZOpaN8Y3P1t$ zY_sMvkdX>d0V?pVfPEhl+%Q)xf&S@0@DTuLzwvH(_E`d$ECI|FOCT~Z4Jt6GT1N~G zI`XO3<%%UR=%Riz&Z#$Rolw+oM?QJEXbxng0#x8sfs0tS*8lI|XXgJ?5?54!3j8Yt zblNStIbNyu*3rvZuTAhr_`y)?O-uvUC?RF~`-`?+EXbUN}*2l7Y2bfHm! Hzfj-{uvaKT diff --git a/compliance/.DS_Store b/compliance/.DS_Store deleted file mode 100644 index 6d8335d3f15377280409843ea7b5e8cdf65537e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRW;4E3}Xq_F7_wzci?$! zrA?C}RtS(Sd0yhNXPh@t921cnFY}maL_`sku{XrfAw198lAc<4(uFmabWhjxFuRSj zmbV#xBLi}{H#oHkEoklhuF7IA2_GcDh&FtRGEJwma>{c@$2%7vFRy3ae)+fj=67+n z+Vc@hVb2A>O&If#-Gtw(+GqFVxyxrgulJ|7elgU%Hr6W2RbF5DHS*d!<-AOc0b{@z z`0EUyX0t^5f;Jih#(*(UGr->m4`oagE5Y#Tzz|vh-~i?zxaMAhW4vObSP5bV;v^I( zp-x*2C*iPr^-B~hK?x_P&4<&SopvZL?2h$)a3_}t+Gq?I15F0{ay#Psf4;r{ZwA?& zF<=b*D+b&k&C)R*No#BC;ked%=p~ee{VKsa1Q($c!cL}vH5#v6 ziQ&W?^P%cRim9NOlhfkEsb{AZiu2yFf9Tc8MS|8F1I9p}fem?VaQ;6jumAH#_GAng z1OJKvSBcN#HeN|{YvJWM*M?|aG#1uN1y?2*_*4vCPR0E1h!@OJ5Sk+<<#<1Wv$v9w*WY z7c?M*W+eNKJs*3Yw6;e?bn&#QMdl(>p%IlzK{#DBO|tV8s42%%wsI$ryKUVT68*&~ z?!A&;ma>)y^vC_LyM50M>&xXu$!Fg+&1%=JXuEkopMAW(U6uVd-}3A4>-Mnbxu-4*`uBGY*F7=s=fB03e^yNuaZqU`)su zGY*EZK-5Bk7OJ_#Pz%R=$bK>7U})i@x%kk$@}YRqv^w&K|wjfiVLoHk|YR zzs4_9Eb_-8K5_<}fq%w;PMfw_;G^>0`sMR@*9Np(Gz$F&DiG+SM*s#qN6wPb?14J` XV#dLcSva4 Date: Wed, 25 Mar 2026 12:46:21 -0600 Subject: [PATCH 5/6] added ds store to git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b9e7b9d72..f22c24327 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ temp/ fuzz /build/ .vscode/ +.DS_Store From d6dd7f37786eb3cec735a596e4bca048eb3270e5 Mon Sep 17 00:00:00 2001 From: Supplementing Date: Tue, 31 Mar 2026 09:10:57 -0600 Subject: [PATCH 6/6] fixed changelog --- spec/changelog.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spec/changelog.yml b/spec/changelog.yml index caebd02ea..5209fc912 100644 --- a/spec/changelog.yml +++ b/spec/changelog.yml @@ -8,6 +8,11 @@ - description: Add support for semantic_text field definition. type: enhancement link: https://github.com/elastic/package-spec/pull/807 +- version: 3.6.1-next + changes: + - description: Add var_groups support to policy template and input levels in integration packages, and to policy template and package root levels in input packages. + type: enhancement + link: https://github.com/elastic/package-spec/pull/1120 - version: 3.6.0 changes: - description: Add pipeline tag validations. @@ -26,9 +31,6 @@ - description: Add var_groups schema to support conditional variable groups for Cloud Connector integration. type: enhancement link: https://github.com/elastic/package-spec/issues/1054 - - description: Add var_groups support to policy template and input levels in integration packages, and to policy template and package root levels in input packages. - type: enhancement - link: https://github.com/elastic/package-spec/pull/1120 - description: Allow to set time series index mode in input packages. type: enhancement link: https://github.com/elastic/package-spec/pull/1066