Skip to content

Commit 82043a8

Browse files
authored
Merge branch 'main' into docs-1281-add-back-crowdstrike-threat-intel-info
2 parents 2d45cb9 + 7f7f913 commit 82043a8

File tree

16 files changed

+253
-62
lines changed

16 files changed

+253
-62
lines changed

.github/workflows/job_trigger-jenkins-pipeline.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,28 @@ on:
1515
required: true
1616
WEBOPS_JENKINS_HOST:
1717
required: true
18-
WEBOPS_AWS_ACCESS_KEY:
19-
required: true
20-
WEBOPS_AWS_SECRET_KEY:
18+
WEBOPS_AWS_ROLE_JENKINS:
2119
required: true
2220
WEBOPS_WEBHOOK_TOKEN:
2321
required: true
2422

2523
jobs:
2624
trigger-jenkins-pipeline:
2725
runs-on: ubuntu-latest
26+
permissions:
27+
id-token: write
28+
contents: read
2829
steps:
2930
- name: Get runner IP
3031
if: always()
3132
id: ip
3233
uses: haythem/public-ip@v1.3
34+
- name: Configure AWS credentials
35+
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8
36+
with:
37+
role-to-assume: ${{ secrets.WEBOPS_AWS_ROLE_JENKINS }}
38+
aws-region: us-east-1
3339
- name: Add runner to AWS security group ingress
34-
env:
35-
AWS_ACCESS_KEY_ID: ${{ secrets.WEBOPS_AWS_ACCESS_KEY }}
36-
AWS_SECRET_ACCESS_KEY: ${{ secrets.WEBOPS_AWS_SECRET_KEY }}
37-
AWS_DEFAULT_REGION: ${{ secrets.WEBOPS_AWS_REGION }}
3840
run: aws ec2 authorize-security-group-ingress --group-name ${{ secrets.WEBOPS_AWS_SG_NAME }} --protocol tcp --port ${{ secrets.WEBOPS_JENKINS_PORT }} --cidr ${{ steps.ip.outputs.ipv4 }}/32
3941
- name: Trigger Jenkins pipeline
4042
run: |
@@ -43,9 +45,5 @@ jobs:
4345
-X POST \
4446
${{ secrets.WEBOPS_JENKINS_HOST }}:${{ secrets.WEBOPS_JENKINS_PORT || '80' }}/generic-webhook-trigger/invoke?token=${{ secrets.WEBOPS_WEBHOOK_TOKEN }}
4547
- name: Remove runner from AWS security group ingress
46-
env:
47-
AWS_ACCESS_KEY_ID: ${{ secrets.WEBOPS_AWS_ACCESS_KEY }}
48-
AWS_SECRET_ACCESS_KEY: ${{ secrets.WEBOPS_AWS_SECRET_KEY }}
49-
AWS_DEFAULT_REGION: ${{ secrets.WEBOPS_AWS_REGION }}
5048
if: always()
5149
run: aws ec2 revoke-security-group-ingress --group-name ${{ secrets.WEBOPS_AWS_SG_NAME }} --protocol tcp --port ${{ secrets.WEBOPS_JENKINS_PORT }} --cidr ${{ steps.ip.outputs.ipv4 }}/32

.github/workflows/workflow_deploy-to-pantheon-prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Deploy to production
22

33
permissions:
44
contents: write
5+
id-token: write
56

67
on:
78
push:
@@ -38,8 +39,7 @@ jobs:
3839
WEBOPS_AWS_SG_NAME: ${{ secrets.WEBOPS_AWS_SG_NAME }}
3940
WEBOPS_JENKINS_PORT: ${{ secrets.WEBOPS_JENKINS_PORT }}
4041
WEBOPS_JENKINS_HOST: ${{ secrets.WEBOPS_JENKINS_HOST }}
41-
WEBOPS_AWS_ACCESS_KEY: ${{ secrets.WEBOPS_AWS_ACCESS_KEY }}
42-
WEBOPS_AWS_SECRET_KEY: ${{ secrets.WEBOPS_AWS_SECRET_KEY }}
42+
WEBOPS_AWS_ROLE_JENKINS: ${{ secrets.WEBOPS_AWS_ROLE_JENKINS }}
4343
WEBOPS_WEBHOOK_TOKEN: ${{ secrets.WEBOPS_WEBHOOK_TOKEN }}
4444
notify-channel:
4545
needs: [build-site,deploy-to-pantheon,trigger-jenkins-pipeline]

cid-redirects.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@
14981498
"/Dashboards-and-Alerts/Dashboards/Get-Started-with-Dashboards-and-Panels/Markdown-Syntax": "/docs/dashboards/panels/markdown-syntax",
14991499
"/Manage/01Account_Usage": "/docs/manage/manage-subscription",
15001500
"/Manage/Connections-and-Integrations/Webhook-Connections/Set-Up-Webhook-Connections/Webhook_for_Opsgenie": "/docs/integrations/saas-cloud/opsgenie/",
1501-
"/Manage/01Account_Usage/Beta_Participation_Opt-In": "/docs/manage/manage-subscription/beta-opt-in",
1501+
"/Manage/01Account_Usage/Beta_Participation_Opt-In": "/docs/beta",
15021502
"/Manage/Search_Optimization_Tools/Manage_Partitions/Create_a_Partition": "/docs/manage/partitions/",
15031503
"/Manage/01Account_Usage/05Manage_Organization": "/docs/manage/manage-subscription/create-and-manage-orgs/manage-org-settings",
15041504
"/Manage/01Account_Usage/01Cloud_Flex_Credits": "/docs/manage/manage-subscription/sumo-logic-credits-accounts",
@@ -3144,7 +3144,7 @@
31443144
"/Knowledge_Base/Parsing/Using_line_breaks_as_an_anchor_within_parse": "/docs/search/search-query-language/parse-operators/parse-predictable-patterns-using-an-anchor",
31453145
"/Knowledge_Base/Search": "/docs/search",
31463146
"/Knowledge_Base/Search/How_to_Prevent_your_Scheduled_Search_from_Timing_Out": "/docs/alerts/scheduled-searches/faq",
3147-
"/Limited_Availability": "/docs/manage/manage-subscription/beta-opt-in",
3147+
"/Limited_Availability": "/docs/beta",
31483148
"/Limited_Availability/Lookup_Tables": "/docs/search/search-query-language/search-operators/lookupcontains",
31493149
"/Limited_Availability/Lookup_Tables/lookupContains_Operator": "/docs/search/search-query-language/search-operators/lookupcontains",
31503150
"/Manage": "/docs/manage",
@@ -3165,10 +3165,10 @@
31653165
"/Manage/01Manage_Subscription/10Create_and_Manage_Orgs_(Service_Providers)": "/docs/manage/manage-subscription/create-and-manage-orgs/create-manage-orgs-service-providers",
31663166
"/Manage/01Manage_Subscription/Create_and_Manage_Orgs_(Service_Providers)": "/docs/manage/manage-subscription/create-and-manage-orgs/create-manage-orgs-service-providers",
31673167
"/Manage/01Manage_Subscription/12Manage_Organizational_Settings": "/docs/manage/manage-subscription/create-and-manage-orgs/manage-org-settings",
3168-
"/Manage/01Manage_Subscription/13Beta_Participation_Opt-In": "/docs/manage/manage-subscription/beta-opt-in",
3168+
"/Manage/01Manage_Subscription/13Beta_Participation_Opt-In": "/docs/beta",
31693169
"/Manage/Manage_Subscription/Manage_Organizational_Settings": "/docs/manage/manage-subscription/create-and-manage-orgs/manage-org-settings",
31703170
"/Manage/01Manage_Subscription/14What_to_do_if_Your_Account_is_Locked": "/docs/manage/users-roles/users/account-locked",
3171-
"/Manage/01Manage_Subscription/16Beta_Participation_Opt-In": "/docs/manage/manage-subscription/beta-opt-in",
3171+
"/Manage/01Manage_Subscription/16Beta_Participation_Opt-In": "/docs/beta",
31723172
"/Manage/01Manage_Subscription/18Close_or_cancel_a_Sumo_Logic_account": "/docs/manage/manage-subscription/close-cancel-sumo-account",
31733173
"/Manage/01Manage_Subscription/Upgrade_a_Cloudflex_Credits_Free_or_Trial_Account": "/docs/manage/manage-subscription/upgrade-account/upgrade-credits-account",
31743174
"/docs/manage/manage-subscription/upgrade-cloud-flex-credits-account": "/docs/manage/manage-subscription/upgrade-account/upgrade-sumo-logic-flex-account",
@@ -4599,5 +4599,6 @@
45994599
"/docs/get-started/training-certification-faq-new": "/docs/get-started/training-certification-faq",
46004600
"/docs/manage/scheduled-views/pausing-inactive-scheduled-views": "/docs/manage/scheduled-views/pause-disable-scheduled-views",
46014601
"/docs/manage/manage-subscription/create-and-manage-orgs/manage-orgs-for-mssps-csiem-rules": "/docs/manage/manage-subscription/create-and-manage-orgs/manage-orgs-for-mssps",
4602-
"/docs/search/mobot-multiturn-beta": "/docs/search/mobot"
4602+
"/docs/search/mobot-multiturn-beta": "/docs/search/mobot",
4603+
"/docs/manage/manage-subscription/beta-opt-in": "/docs/beta"
46034604
}

docs/beta/index.md

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,27 @@ import useBaseUrl from '@docusaurus/useBaseUrl';
99

1010
<img src={useBaseUrl('img/icons/business/beta.png')} alt="icon" width="55"/>
1111

12-
Learn about our Beta features that are coming soon to general availability. To participate, contact your Sumo account executive.
12+
Beta features are capabilities that are coming soon to general availability. To participate, contact your Sumo account executive.
1313

14-
Betas are different than our generally available services in that they have additional terms and conditions for participation. You can [opt-in to beta terms and conditions](/docs/manage/manage-subscription/beta-opt-in), so that you only need to agree to the terms once.
15-
16-
* We may make available to you a Preview, Limited Release, Alpha, Beta or other pre-release version of the service, applications, or APIs for non-production use (“Beta”).
14+
Betas are different than our generally available services in that they have additional terms and conditions for participation:
15+
* We may make available to you a Preview, Limited Release, Alpha, Beta, or other pre-release version of the service, applications, or APIs for non-production use.
1716
* Betas may have limited features, functions, indexing capacity, storage, data security, data continuity, data retention or other limitations as determined by Sumo Logic.
18-
* Sumo Logic may discontinue the Beta at any time.
19-
* We may also decide never to make the features and functionality in Beta generally available.
20-
* Betas (by their nature) have not been fully tested as they are still under development and may be inoperable or incomplete, including more errors and bugs than our generally available offerings.
17+
* Sumo Logic may discontinue the beta at any time.
18+
* We may also decide never to make the features and functionality in beta generally available.
19+
* Betas (by their nature) have not been fully tested as they are still under development, and may be inoperable or incomplete, including more errors and bugs than our generally available offerings.
2120
* Betas are offered “as is” with no warranties or indemnities.
2221

22+
## Features in open beta
23+
24+
See [Beta Releases](/docs/contributing/style-guide/#beta-releases) for information about how we publish articles for features in closed beta and open beta.
25+
26+
Following are articles for features in open beta:
2327

24-
<DocCardList items={useCurrentSidebarCategory().items}/>
28+
<div className="box-wrapper" markdown="1">
29+
<div className="box smallbox card">
30+
<div className="container">
31+
<a href={useBaseUrl('docs/api/metrics-searches/')}><img src={useBaseUrl('img/icons/metrics.png')} alt="Thumbnail icon" width="40"/><h4>Metrics Search Management APIs</h4></a>
32+
<p>Use Metrics Searches (Beta) API endpoints to save metrics searches in your content library, organize them in a folder hierarchy, and share useful queries with users in your organization.</p>
33+
</div>
34+
</div>
35+
</div>

0 commit comments

Comments
 (0)