Skip to content

Commit 821848f

Browse files
andrewarditoandrewardito
authored
Merge branch 'master' into andrew.ardito/apmsecurity
2 parents b819d88 + 3f2205a commit 821848f

File tree

128 files changed

+40516
-3324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+40516
-3324
lines changed

‎.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.2.0",
7-
"regenerated": "2020-07-15 09:52:13.956161",
8-
"spec_repo_commit": "3855e31"
7+
"regenerated": "2020-07-23 13:03:18.827682",
8+
"spec_repo_commit": "74f1613"
99
},
1010
"v2": {
1111
"apigentools_version": "1.2.0",
12-
"regenerated": "2020-07-15 09:52:18.465343",
13-
"spec_repo_commit": "3855e31"
12+
"regenerated": "2020-07-23 13:03:23.574022",
13+
"spec_repo_commit": "74f1613"
1414
}
1515
}
1616
}

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ content/en/security_monitoring/default_rules/*.md
5959
*.log
6060
npm-debug.log*
6161

62+
# serverless
63+
!content/en/serverless/troubleshooting/installing_the_forwarder.md
64+
6265
# Runtime data
6366
pids
6467
*.pid

‎.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ build_live:
156156
variables:
157157
CONFIG: ${LIVE_CONFIG}
158158
URL: ${LIVE_DOMAIN}
159-
UNTRACKED_EXTRAS: "data,content/en/agent/basic_agent_usage/heroku.md,content/en/agent/basic_agent_usage/ansible.md,content/en/agent/basic_agent_usage/chef.md,content/en/agent/basic_agent_usage/puppet.md,content/en/developers/integrations,content/en/agent/basic_agent_usage/saltstack.md,content/en/developers/amazon_cloudformation.md,content/en/integrations,content/en/logs/log_collection/android.md,content/en/logs/log_collection/ios.md,content/en/tracing/setup/android.md,content/en/tracing/setup/ruby.md,content/en/security_monitoring/default_rules"
159+
UNTRACKED_EXTRAS: "data,content/en/agent/basic_agent_usage/heroku.md,content/en/agent/basic_agent_usage/ansible.md,content/en/agent/basic_agent_usage/chef.md,content/en/agent/basic_agent_usage/puppet.md,content/en/developers/integrations,content/en/agent/basic_agent_usage/saltstack.md,content/en/developers/amazon_cloudformation.md,content/en/integrations,content/en/logs/log_collection/android.md,content/en/logs/log_collection/ios.md,content/en/tracing/setup/android.md,content/en/tracing/setup/ruby.md,content/en/security_monitoring/default_rules,content/en/serverless/troubleshooting/installing_the_forwarder.md"
160160
CONFIGURATION_FILE: "./local/bin/py/build/configurations/pull_config.yaml"
161161
LOCAL: "False"
162162
script:

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ clean-auto-doc: ##Remove all doc automatically created
101101
rm -f content/en/agent/basic_agent_usage/puppet.md ;fi
102102
@if [ content/en/agent/basic_agent_usage/saltstack.md ]; then \
103103
rm -f content/en/agent/basic_agent_usage/saltstack.md ;fi
104+
@if [ content/en/serverless/troubleshooting/installing_the_forwarder.md ]; then \
105+
rm -f content/en/serverless/troubleshooting/installing_the_forwarder.md ;fi
104106
@if [ content/en/tracing/setup/ruby.md ]; then \
105107
rm -f content/en/tracing/setup/ruby.md ;fi
106108
@if [ content/en/developers/amazon_cloudformation.md ]; then \

‎config/_default/menus/menus.en.yaml

Lines changed: 83 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -502,11 +502,16 @@ main:
502502
url: dashboards/graphing_json/request_json/
503503
parent: graphing_json
504504
weight: 902
505+
- name: Mobile
506+
url: mobile/
507+
identifier: mobile
508+
pre: nav_mobile
509+
weight: 80000
505510
- name: Infrastructure
506511
url: infrastructure/
507512
identifier: infrastructure
508513
pre: nav_infrastructure
509-
weight: 80000
514+
weight: 90000
510515
- name: Infrastructure List
511516
url: infrastructure/list/
512517
parent: infrastructure
@@ -528,25 +533,51 @@ main:
528533
parent: infrastructure
529534
weight: 6
530535
- name: Serverless
531-
url: infrastructure/serverless/
532-
parent: infrastructure
536+
url: serverless
537+
pre: nav_serverless
533538
identifier: serverless
534-
weight: 7
535-
- name: Azure App Services Extension
536-
url: infrastructure/serverless/azure_app_services/
539+
weight: 100000
540+
- name: Installation
541+
url: serverless/installation
537542
parent: serverless
538-
identifier: app_services_extension
539-
weight: 701
540-
- name: Datadog Lambda Layer
541-
url: infrastructure/serverless/datadog_lambda_layer
543+
identifier: serverless_installation
544+
weight: 1
545+
- name: Python
546+
url: serverless/installation/python
547+
parent: serverless_installation
548+
identifier: serverless_installation_python
549+
weight: 101
550+
- name: Node
551+
url: serverless/installation/nodejs
552+
parent: serverless_installation
553+
weight: 102
554+
- name: Ruby
555+
url: serverless/installation/ruby
556+
parent: serverless_installation
557+
weight: 103
558+
- name: Troubleshooting
559+
url: serverless/troubleshooting
542560
parent: serverless
543-
identifier: datadog_lambda_layer
544-
weight: 701
561+
identifier: serverless_troubleshooting
562+
weight: 2
563+
- name: Forwarder
564+
url: serverless/troubleshooting/installing_the_forwarder
565+
parent: serverless_troubleshooting
566+
weight: 201
567+
- name: Layer
568+
url: serverless/troubleshooting/installing_the_layer
569+
parent: serverless_troubleshooting
570+
weight: 202
571+
- name: Azure App Services Extension
572+
url: serverless/azure_app_services
573+
parent: serverless
574+
identifier: serverless_app_services
575+
weight: 5
545576
- name: Metrics
546577
url: metrics/
547578
identifier: metrics_top_level
548579
pre: nav_metrics
549-
weight: 90000
580+
weight: 110000
550581
- name: Introduction
551582
url: metrics/introduction/
552583
parent: metrics_top_level
@@ -568,12 +599,12 @@ main:
568599
url: notebooks/
569600
identifier: notebooks
570601
pre: nav_notebooks
571-
weight: 100000
602+
weight: 120000
572603
- name: Alerting
573604
url: monitors/
574605
pre: nav_alerting
575606
identifier: alerting
576-
weight: 110000
607+
weight: 130000
577608
- name: Monitors
578609
url: monitors/monitor_types/
579610
parent: alerting
@@ -702,7 +733,7 @@ main:
702733
url: tracing/
703734
pre: nav_tracing
704735
identifier: tracing
705-
weight: 120000
736+
weight: 140000
706737
- name: Compatibility
707738
url: tracing/compatibility_requirements/
708739
identifier: tracing_compatibility_requirements
@@ -1034,7 +1065,7 @@ main:
10341065
url: logs/
10351066
pre: nav_logs
10361067
identifier: log_management
1037-
weight: 130000
1068+
weight: 150000
10381069
- name: Log Collection & Integrations
10391070
url: logs/log_collection/
10401071
parent: log_management
@@ -1190,7 +1221,7 @@ main:
11901221
url: security_monitoring/
11911222
pre: nav_security_monitoring
11921223
identifier: security_monitoring
1193-
weight: 135000
1224+
weight: 160000
11941225
- name: Getting Started
11951226
url: security_monitoring/getting_started
11961227
parent: security_monitoring
@@ -1215,7 +1246,7 @@ main:
12151246
url: synthetics/
12161247
pre: nav_synthetics
12171248
identifier: synthetics
1218-
weight: 140000
1249+
weight: 170000
12191250
- name: API Tests
12201251
url: synthetics/api_tests/
12211252
parent: synthetics
@@ -1284,7 +1315,7 @@ main:
12841315
url: real_user_monitoring/
12851316
pre: nav_rum
12861317
identifier: rum
1287-
weight: 150000
1318+
weight: 180000
12881319
- name: Get Started
12891320
url: real_user_monitoring/installation/
12901321
parent: rum
@@ -1369,7 +1400,7 @@ main:
13691400
url: network_performance_monitoring/
13701401
pre: nav_network
13711402
identifier: npm
1372-
weight: 160000
1403+
weight: 190000
13731404
- name: Installation
13741405
url: network_performance_monitoring/installation
13751406
parent: npm
@@ -1389,7 +1420,7 @@ main:
13891420
url: developers/
13901421
pre: nav_developers
13911422
identifier: dev_tools
1392-
weight: 170000
1423+
weight: 200000
13931424
- name: DogStatsD
13941425
url: developers/dogstatsd/
13951426
parent: dev_tools
@@ -1551,12 +1582,12 @@ main:
15511582
url: api/
15521583
pre: nav_api
15531584
identifier: api
1554-
weight: 180000
1585+
weight: 210000
15551586
- name: Account Management
15561587
url: account_management/
15571588
pre: nav_account
15581589
identifier: account_management
1559-
weight: 190000
1590+
weight: 220000
15601591
- name: User management
15611592
url: account_management/users/
15621593
parent: account_management
@@ -1629,7 +1660,7 @@ main:
16291660
url: security/
16301661
pre: nav_security
16311662
identifier: security
1632-
weight: 200000
1663+
weight: 230000
16331664
- name: Agent
16341665
url: security/agent/
16351666
parent: security
@@ -1650,7 +1681,7 @@ main:
16501681
url: help/
16511682
pre: nav_help
16521683
identifier: help_top_level
1653-
weight: 210000
1684+
weight: 240000
16541685
api_v1:
16551686
- name: Overview
16561687
url: /api/v1/
@@ -2319,18 +2350,6 @@ api_v1:
23192350
parent: Synthetics
23202351
url: pause-or-start-a-test
23212352
generated: true
2322-
- name: Create a global variable
2323-
parent: Synthetics
2324-
url: create-a-global-variable
2325-
generated: true
2326-
- name: Delete a global variable
2327-
parent: Synthetics
2328-
url: delete-a-global-variable
2329-
generated: true
2330-
- name: Edit a global variable
2331-
parent: Synthetics
2332-
url: edit-a-global-variable
2333-
generated: true
23342353
- name: Tags
23352354
url: /api/v1/tags/
23362355
identifier: Tags
@@ -2371,6 +2390,22 @@ api_v1:
23712390
url: /api/v1/usage-metering/
23722391
identifier: Usage Metering
23732392
generated: true
2393+
- name: Get the list of available daily custom reports
2394+
parent: Usage Metering
2395+
url: get-the-list-of-available-daily-custom-reports
2396+
generated: true
2397+
- name: Get specified daily custom reports
2398+
parent: Usage Metering
2399+
url: get-specified-daily-custom-reports
2400+
generated: true
2401+
- name: Get the list of available monthly custom reports
2402+
parent: Usage Metering
2403+
url: get-the-list-of-available-monthly-custom-reports
2404+
generated: true
2405+
- name: Get specified monthly custom reports
2406+
parent: Usage Metering
2407+
url: get-specified-monthly-custom-reports
2408+
generated: true
23742409
- name: Get hourly usage for analyzed logs
23752410
parent: Usage Metering
23762411
url: get-hourly-usage-for-analyzed-logs
@@ -2379,9 +2414,9 @@ api_v1:
23792414
parent: Usage Metering
23802415
url: get-hourly-usage-for-lambda
23812416
generated: true
2382-
- name: Get monthly billable summary
2417+
- name: Get billable usage across your multi-org account
23832418
parent: Usage Metering
2384-
url: get-monthly-billable-summary
2419+
url: get-billable-usage-across-your-multi-org-account
23852420
generated: true
23862421
- name: Get hourly usage for Fargate
23872422
parent: Usage Metering
@@ -2779,6 +2814,14 @@ api_v2:
27792814
parent: Security Monitoring
27802815
url: update-an-existing-rule
27812816
generated: true
2817+
- name: Get a quick list of security signals
2818+
parent: Security Monitoring
2819+
url: get-a-quick-list-of-security-signals
2820+
generated: true
2821+
- name: Get a list of security signals
2822+
parent: Security Monitoring
2823+
url: get-a-list-of-security-signals
2824+
generated: true
27822825
- name: Service Checks
27832826
url: /api/v2/service-checks/
27842827
identifier: Service Checks

‎config/_default/menus/menus.fr.yaml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2311,18 +2311,6 @@ api_v1:
23112311
parent: Synthetics
23122312
url: pause-or-start-a-test
23132313
generated: true
2314-
- name: Create a global variable
2315-
parent: Synthetics
2316-
url: create-a-global-variable
2317-
generated: true
2318-
- name: Delete a global variable
2319-
parent: Synthetics
2320-
url: delete-a-global-variable
2321-
generated: true
2322-
- name: Edit a global variable
2323-
parent: Synthetics
2324-
url: edit-a-global-variable
2325-
generated: true
23262314
- name: Tags
23272315
url: /fr/api/v1/tags/
23282316
identifier: Tags
@@ -2363,6 +2351,22 @@ api_v1:
23632351
url: /fr/api/v1/usage-metering/
23642352
identifier: Usage Metering
23652353
generated: true
2354+
- name: Get the list of available daily custom reports
2355+
parent: Usage Metering
2356+
url: get-the-list-of-available-daily-custom-reports
2357+
generated: true
2358+
- name: Get specified daily custom reports
2359+
parent: Usage Metering
2360+
url: get-specified-daily-custom-reports
2361+
generated: true
2362+
- name: Get the list of available monthly custom reports
2363+
parent: Usage Metering
2364+
url: get-the-list-of-available-monthly-custom-reports
2365+
generated: true
2366+
- name: Get specified monthly custom reports
2367+
parent: Usage Metering
2368+
url: get-specified-monthly-custom-reports
2369+
generated: true
23662370
- name: Get hourly usage for analyzed logs
23672371
parent: Usage Metering
23682372
url: get-hourly-usage-for-analyzed-logs
@@ -2371,9 +2375,9 @@ api_v1:
23712375
parent: Usage Metering
23722376
url: get-hourly-usage-for-lambda
23732377
generated: true
2374-
- name: Get monthly billable summary
2378+
- name: Get billable usage across your multi-org account
23752379
parent: Usage Metering
2376-
url: get-monthly-billable-summary
2380+
url: get-billable-usage-across-your-multi-org-account
23772381
generated: true
23782382
- name: Get hourly usage for Fargate
23792383
parent: Usage Metering

0 commit comments

Comments
 (0)