Skip to content

Commit fdc3ee4

Browse files
authored
Merge branch 'main' into CONN-4131-doc-update
2 parents 6465973 + 95b1f15 commit fdc3ee4

File tree

16 files changed

+546
-64
lines changed

16 files changed

+546
-64
lines changed

.clabot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@
174174
"darshan-sumo",
175175
"mahendrak-sumo",
176176
"chvik",
177-
"Apoorvkudesia-sumologic"
177+
"Apoorvkudesia-sumologic",
178+
"akesle"
178179
],
179180
"message": "Thank you for your contribution! As this is an open source project, we require contributors to sign our Contributor License Agreement and do not have yours on file. To proceed with your PR, please [sign your name here](https://forms.gle/YgLddrckeJaCdZYA6) and we will add you to our approved list of contributors.",
180181
"label": "cla-signed",

cid-redirects.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,10 @@
17641764
"/cid/10321": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/windows",
17651765
"/cid/10322": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/docker",
17661766
"/cid/10323": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/nginx",
1767-
"/cid/10324": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/kafka",
1767+
"/cid/10340": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/kafka",
1768+
"/cid/10341": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/postgresql",
1769+
"/cid/10342": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/mysql",
1770+
"/cid/10343": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/elasticsearch",
17681771
"/cid/10325": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/apache/changelog",
17691772
"/cid/10326": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/linux/changelog",
17701773
"/cid/10327": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/localfile/changelog",
@@ -1776,6 +1779,10 @@
17761779
"/cid/10337": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/docker/changelog",
17771780
"/cid/10338": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/nginx/changelog",
17781781
"/cid/10339": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/kafka/changelog",
1782+
"/cid/10344": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/postgresql/changelog",
1783+
"/cid/10345": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/mysql/changelog",
1784+
"/cid/10346": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/elasticsearch/changelog",
1785+
"/cid/10347": "/docs/send-data/opentelemetry-collector/remote-management/source-templates/st-with-secrets",
17791786
"/cid/10822": "/docs/manage/manage-subscription/create-manage-orgs-flex",
17801787
"/cid/10817": "/docs/integrations/sumo-apps/cse",
17811788
"/cid/10818": "/docs/integrations/sumo-apps/cse",

docs/integrations/databases/opentelemetry/postgresql-opentelemetry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This app supports PostgreSQL version 9.6+.
1919

2020
We use the OpenTelemetry collector for PostgreSQL metric collection and for collecting PostgreSQL logs.
2121

22-
The diagram below illustrates the components of the PostgreSQL collection for each database server. OpenTelemetry collector runs on the same host as PostgreSQL, and uses the [PostgreSQL receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/postgresqlreceiver) to obtain PostgreSQL metrics, and the [Sumo Logic OpenTelemetry Exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter) to send the metrics to Sumo Logic. MySQL logs are sent to Sumo Logic through a [filelog receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver).
22+
The diagram below illustrates the components of the PostgreSQL collection for each database server. OpenTelemetry collector runs on the same host as PostgreSQL, and uses the [PostgreSQL receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/postgresqlreceiver) to obtain PostgreSQL metrics, and the [Sumo Logic OpenTelemetry Exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter) to send the metrics to Sumo Logic. PostgreSQL logs are sent to Sumo Logic through a [filelog receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver).
2323

2424
<img src='https://sumologic-app-data-v2.s3.amazonaws.com/dashboards/Postgresql-OpenTelemetry/PostgreSQL-Schematics.png' alt="Schematics" />
2525

@@ -107,7 +107,7 @@ import SetupColl from '../../../reuse/apps/opentelemetry/set-up-collector.md';
107107

108108
### Step 2: Configure integration
109109

110-
In this step, you will configure the yaml file required for Mysql collection.
110+
In this step, you will configure the yaml file required for PostgreSQL collection.
111111

112112
Below is the required input:
113113

docs/integrations/saas-cloud/fastly.md

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -69,39 +69,39 @@ When you configure the Sumo Logic endpoint in Fastly:
6969
"protocol": "%{req.proto}V",
7070
"host": "%{req.http.Fastly-Orig-Host}V",
7171
"origin_host": "%{req.http.Host}V",
72-
"url": "%{cstr_escape(req.url)}V",
72+
"url": "%{json.escape(req.url)}V",
7373
"is_ipv6": "%{if(req.is_ipv6, \"true\", \"false\")}V",
7474
"is_tls": "%{if(req.is_ssl, \"true\", \"false\")}V",
75-
"tls_client_protocol": "%{cstr_escape(tls.client.protocol)}V",
76-
"tls_client_servername": "%{cstr_escape(tls.client.servername)}V",
77-
"tls_client_cipher": "%{cstr_escape(tls.client.cipher)}V",
78-
"tls_client_cipher_sha": "%{cstr_escape(tls.client.ciphers_sha)}V",
79-
"tls_client_tlsexts_sha": "%{cstr_escape(tls.client.tlsexts_sha)}V",
75+
"tls_client_protocol": "%{json.escape(tls.client.protocol)}V",
76+
"tls_client_servername": "%{json.escape(tls.client.servername)}V",
77+
"tls_client_cipher": "%{json.escape(tls.client.cipher)}V",
78+
"tls_client_cipher_sha": "%{json.escape(tls.client.ciphers_sha)}V",
79+
"tls_client_tlsexts_sha": "%{json.escape(tls.client.tlsexts_sha)}V",
8080
"is_h2": "%{if(fastly_info.is_h2, \"true\", \"false\")}V",
8181
"is_h2_push": "%{if(fastly_info.h2.is_push, \"true\", \"false\")}V",
8282
"h2_stream_id": "%{fastly_info.h2.stream_id}V",
83-
"request_referer": "%{cstr_escape(req.http.Referer)}V",
84-
"request_user_agent": "%{cstr_escape(req.http.User-Agent)}V",
85-
"request_accept_content": "%{cstr_escape(req.http.Accept)}V",
86-
"request_accept_language": "%{cstr_escape(req.http.Accept-Language)}V",
87-
"request_accept_encoding": "%{cstr_escape(req.http.Accept-Encoding)}V",
88-
"request_accept_charset": "%{cstr_escape(req.http.Accept-Charset)}V",
89-
"request_connection": "%{cstr_escape(req.http.Connection)}V",
90-
"request_dnt": "%{cstr_escape(req.http.DNT)}V",
91-
"request_forwarded": "%{cstr_escape(req.http.Forwarded)}V",
92-
"request_via": "%{cstr_escape(req.http.Via)}V",
93-
"request_cache_control": "%{cstr_escape(req.http.Cache-Control)}V",
94-
"request_x_requested_with": "%{cstr_escape(req.http.X-Requested-With)}V",
95-
"request_x_forwarded_for": "%{cstr_escape(req.http.X-Forwarded-For)}V",
83+
"request_referer": "%{json.escape(req.http.Referer)}V",
84+
"request_user_agent": "%{json.escape(req.http.User-Agent)}V",
85+
"request_accept_content": "%{json.escape(req.http.Accept)}V",
86+
"request_accept_language": "%{json.escape(req.http.Accept-Language)}V",
87+
"request_accept_encoding": "%{json.escape(req.http.Accept-Encoding)}V",
88+
"request_accept_charset": "%{json.escape(req.http.Accept-Charset)}V",
89+
"request_connection": "%{json.escape(req.http.Connection)}V",
90+
"request_dnt": "%{json.escape(req.http.DNT)}V",
91+
"request_forwarded": "%{json.escape(req.http.Forwarded)}V",
92+
"request_via": "%{json.escape(req.http.Via)}V",
93+
"request_cache_control": "%{json.escape(req.http.Cache-Control)}V",
94+
"request_x_requested_with": "%{json.escape(req.http.X-Requested-With)}V",
95+
"request_x_forwarded_for": "%{json.escape(req.http.X-Forwarded-For)}V",
9696
"status": "%{resp.status}V",
97-
"content_type": "%{cstr_escape(resp.http.Content-Type)}V",
97+
"content_type": "%{json.escape(resp.http.Content-Type)}V",
9898
"cache_status": "%{regsub(fastly_info.state, \"^(HIT-(SYNTH)|(HITPASS|HIT|MISS|PASS|ERROR|PIPE)).*\", \"\\2\\3\")}V",
9999
"is_cacheable": "%{if(fastly_info.state~\"^(HIT|MISS)$\", \"true\", \"false\")}V",
100-
"response_age": "%{cstr_escape(resp.http.Age)}V",
101-
"response_cache_control": "%{cstr_escape(resp.http.Cache-Control)}V",
102-
"response_expires": "%{cstr_escape(resp.http.Expires)}V",
103-
"response_last_modified": "%{cstr_escape(resp.http.Last-Modified)}V",
104-
"response_tsv": "%{cstr_escape(resp.http.TSV)}V",
100+
"response_age": "%{json.escape(resp.http.Age)}V",
101+
"response_cache_control": "%{json.escape(resp.http.Cache-Control)}V",
102+
"response_expires": "%{json.escape(resp.http.Expires)}V",
103+
"response_last_modified": "%{json.escape(resp.http.Last-Modified)}V",
104+
"response_tsv": "%{json.escape(resp.http.TSV)}V",
105105
"geo_datacenter": "%{server.datacenter}V",
106106
"geo_city": "%{client.geo.city}V",
107107
"geo_country_code": "%{client.geo.country_code}V",
@@ -152,39 +152,39 @@ If you have Fastly's Web Application Firewall (WAF), perform these steps to upda
152152
"protocol": "%{req.proto}V",
153153
"host": "%{req.http.Fastly-Orig-Host}V",
154154
"origin_host": "%{req.http.Host}V",
155-
"url": "%{cstr_escape(req.url)}V",
155+
"url": "%{json.escape(req.url)}V",
156156
"is_ipv6": "%{if(req.is_ipv6, \"true\", \"false\")}V",
157157
"is_tls": "%{if(req.is_ssl, \"true\", \"false\")}V",
158-
"tls_client_protocol": "%{cstr_escape(tls.client.protocol)}V",
159-
"tls_client_servername": "%{cstr_escape(tls.client.servername)}V",
160-
"tls_client_cipher": "%{cstr_escape(tls.client.cipher)}V",
161-
"tls_client_cipher_sha": "%{cstr_escape(tls.client.ciphers_sha)}V",
162-
"tls_client_tlsexts_sha": "%{cstr_escape(tls.client.tlsexts_sha)}V",
158+
"tls_client_protocol": "%{json.escape(tls.client.protocol)}V",
159+
"tls_client_servername": "%{json.escape(tls.client.servername)}V",
160+
"tls_client_cipher": "%{json.escape(tls.client.cipher)}V",
161+
"tls_client_cipher_sha": "%{json.escape(tls.client.ciphers_sha)}V",
162+
"tls_client_tlsexts_sha": "%{json.escape(tls.client.tlsexts_sha)}V",
163163
"is_h2": "%{if(fastly_info.is_h2, \"true\", \"false\")}V",
164164
"is_h2_push": "%{if(fastly_info.h2.is_push, \"true\", \"false\")}V",
165165
"h2_stream_id": "%{fastly_info.h2.stream_id}V",
166-
"request_referer": "%{cstr_escape(req.http.Referer)}V",
167-
"request_user_agent": "%{cstr_escape(req.http.User-Agent)}V",
168-
"request_accept_content": "%{cstr_escape(req.http.Accept)}V",
169-
"request_accept_language": "%{cstr_escape(req.http.Accept-Language)}V",
170-
"request_accept_encoding": "%{cstr_escape(req.http.Accept-Encoding)}V",
171-
"request_accept_charset": "%{cstr_escape(req.http.Accept-Charset)}V",
172-
"request_connection": "%{cstr_escape(req.http.Connection)}V",
173-
"request_dnt": "%{cstr_escape(req.http.DNT)}V",
174-
"request_forwarded": "%{cstr_escape(req.http.Forwarded)}V",
175-
"request_via": "%{cstr_escape(req.http.Via)}V",
176-
"request_cache_control": "%{cstr_escape(req.http.Cache-Control)}V",
177-
"request_x_requested_with": "%{cstr_escape(req.http.X-Requested-With)}V",
178-
"request_x_forwarded_for": "%{cstr_escape(req.http.X-Forwarded-For)}V",
166+
"request_referer": "%{json.escape(req.http.Referer)}V",
167+
"request_user_agent": "%{json.escape(req.http.User-Agent)}V",
168+
"request_accept_content": "%{json.escape(req.http.Accept)}V",
169+
"request_accept_language": "%{json.escape(req.http.Accept-Language)}V",
170+
"request_accept_encoding": "%{json.escape(req.http.Accept-Encoding)}V",
171+
"request_accept_charset": "%{json.escape(req.http.Accept-Charset)}V",
172+
"request_connection": "%{json.escape(req.http.Connection)}V",
173+
"request_dnt": "%{json.escape(req.http.DNT)}V",
174+
"request_forwarded": "%{json.escape(req.http.Forwarded)}V",
175+
"request_via": "%{json.escape(req.http.Via)}V",
176+
"request_cache_control": "%{json.escape(req.http.Cache-Control)}V",
177+
"request_x_requested_with": "%{json.escape(req.http.X-Requested-With)}V",
178+
"request_x_forwarded_for": "%{json.escape(req.http.X-Forwarded-For)}V",
179179
"status": "%{resp.status}V",
180-
"content_type": "%{cstr_escape(resp.http.Content-Type)}V",
180+
"content_type": "%{json.escape(resp.http.Content-Type)}V",
181181
"cache_status": "%{regsub(fastly_info.state, \"^(HIT-(SYNTH)|(HITPASS|HIT|MISS|PASS|ERROR|PIPE)).*\", \"\\2\\3\")}V",
182182
"is_cacheable": "%{if(fastly_info.state~\"^(HIT|MISS)$\", \"true\", \"false\")}V",
183-
"response_age": "%{cstr_escape(resp.http.Age)}V",
184-
"response_cache_control": "%{cstr_escape(resp.http.Cache-Control)}V",
185-
"response_expires": "%{cstr_escape(resp.http.Expires)}V",
186-
"response_last_modified": "%{cstr_escape(resp.http.Last-Modified)}V",
187-
"response_tsv": "%{cstr_escape(resp.http.TSV)}V",
183+
"response_age": "%{json.escape(resp.http.Age)}V",
184+
"response_cache_control": "%{json.escape(resp.http.Cache-Control)}V",
185+
"response_expires": "%{json.escape(resp.http.Expires)}V",
186+
"response_last_modified": "%{json.escape(resp.http.Last-Modified)}V",
187+
"response_tsv": "%{json.escape(resp.http.TSV)}V",
188188
"geo_datacenter": "%{server.datacenter}V",
189189
"geo_city": "%{client.geo.city}V",
190190
"geo_country_code": "%{client.geo.country_code}V",
@@ -214,7 +214,7 @@ If you have Fastly's Web Application Firewall (WAF), perform these steps to upda
214214
"waf_rule_id": "%{waf.rule_id}V",
215215
"waf_severity": "%{waf.severity}V",
216216
"waf_passed": "%{waf.passed}V",
217-
"waf_logdata": "%{cstr_escape(waf.logdata)}V",
217+
"waf_logdata": "%{json.escape(waf.logdata)}V",
218218
"waf_executed": "%{waf.executed}V",
219219
"waf_anomaly_score": "%{waf.anomaly_score}V",
220220
"waf_sql_score": "%{waf.sql_injection_score}V",
@@ -225,7 +225,7 @@ If you have Fastly's Web Application Firewall (WAF), perform these steps to upda
225225
"waf_php_score": "%{waf.php_injection_score}V",
226226
"waf_rce_score": "%{waf.rce_score}V",
227227
"waf_session_fixation_score": "%{waf.session_fixation_score}V",
228-
"waf_message": "%{cstr_escape(waf.message)}V"
228+
"waf_message": "%{json.escape(waf.message)}V"
229229
}
230230
```
231231
</details>
@@ -251,10 +251,10 @@ If you have Fastly's Web Application Firewall (WAF), perform these steps to add
251251
"request": "%{req.request}V",
252252
"protocol": "%{req.proto}V",
253253
"origin_host": "%{req.http.Host}V",
254-
"url": "%{cstr_escape(req.url)}V",
255-
"request_referer": "%{cstr_escape(req.http.Referer)}V",
256-
"request_user_agent": "%{cstr_escape(req.http.User-Agent)}V",
257-
"request_accept_content": "%{cstr_escape(req.http.Accept)}V",
254+
"url": "%{json.escape(req.url)}V",
255+
"request_referer": "%{json.escape(req.http.Referer)}V",
256+
"request_user_agent": "%{json.escape(req.http.User-Agent)}V",
257+
"request_accept_content": "%{json.escape(req.http.Accept)}V",
258258
"cache_status": "%{regsub(fastly_info.state, \"^(HIT-(SYNTH)|(HITPASS|HIT|MISS|PASS|ERROR|PIPE|NONE)).*\", \"\\2\\3\")}V",
259259
"geo_datacenter": "%{server.datacenter}V",
260260
"geo_city": "%{client.geo.city}V",
@@ -268,7 +268,7 @@ If you have Fastly's Web Application Firewall (WAF), perform these steps to add
268268
"waf_rule_id": "%{waf.rule_id}V",
269269
"waf_severity": "%{waf.severity}V",
270270
"waf_passed": "%{waf.passed}V",
271-
"waf_logdata": "%{cstr_escape(waf.logdata)}V",
271+
"waf_logdata": "%{json.escape(waf.logdata)}V",
272272
"waf_executed": "%{waf.executed}V",
273273
"waf_anomaly_score": "%{waf.anomaly_score}V",
274274
"waf_sql_score": "%{waf.sql_injection_score}V",
@@ -279,7 +279,7 @@ If you have Fastly's Web Application Firewall (WAF), perform these steps to add
279279
"waf_php_score": "%{waf.php_injection_score}V",
280280
"waf_rce_score": "%{waf.rce_score}V",
281281
"waf_session_fixation_score": "%{waf.session_fixation_score}V",
282-
"waf_message": "%{cstr_escape(waf.message)}V"
282+
"waf_message": "%{json.escape(waf.message)}V"
283283
}
284284
```
285285

docs/manage/partitions/flex/faq.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ We recommend you configure partitions to have less than 5 TB per day flowing int
9191
9292
Default scope allows you to include or exclude the partitions in the search query, helping you to optimize the search cost. For example, if a query needs to run through 10 partitions, which consumes about 10 GB of search data, narrowing the search query using the default scope can improve the query performance and reduce scan cost. You can modify the default scope by selecting or deselecting the **Include this partition in default scope** checkbox when creating/updating your partition. Let's say that out of 10 partitions, you excluded two partitions. Now, when you run a query that does not have `_index` / `_view` term referenced in the query, the search will only consider the included partitions, reducing the amount of data scanned and lowering the cost.
9393

94+
If you do not specify a partition name using `_index` or `_view`, or if you do not use metadata fields in your query scope that correspond to the routing expression of a partition, you will be billed for all default scope partitions that are not explicitly excluded. This also includes the `sumologic_default` partition.
9495

95-
When partitions are marked as included and `_index` or `_view` is not referenced in the query, all included partitions will be considered by default. Default scope is also useful when `AND` or `OR` conditions are used in the query with `_index`. For example, consider you have three partitions: Partition A (Excluded), Partition B (Included), and Partition C (Included). Below are some scenarios:
96+
When partitions are marked as included and `_index` or `_view` is not referenced in the query, all partitions part of default scope will be considered by default. Default scope is also useful when `AND` or `OR` conditions are used in the query with `_index`. For example, consider you have three partitions: Partition A (Excluded), Partition B (Included), and Partition C (Included). Below are some scenarios:
9697

9798
- When you run the query without referring to `_index`, for example `error | count`, only Partition B and Partition C will be considered for the query, as Partition A is excluded from the default scope.
9899
- When you run a query referring to an index term, for example `_index="Partition A"`, only Partition A will be considered for the query. 

docs/search/get-started-with-search/search-page/log-level.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ Sumo Logic detects five log levels out of the box: FATAL, ERROR, WARN, INFO, and
5454

5555
Log-Level pattern detection is automatic, meaning you do not need to parse log levels manually or write specific queries to see your distribution of error logs.
5656

57-
If the log message is in JSON format, the log level detection method searches for the presence of keys such as "level", "Level", "loglevel", "logLevel", "Loglevel", "LogLevel", "log_level", "log-level", "Log_Level", "Log_level", "severity", or "_loglevel." If any of these keys are identified in the log message, their corresponding values will be considered and displayed in the results. And if the log message is in a non-JSON format, the log level detection method looks for keywords such as "debug", "info/information", "warn/warning", and "error." If any of these keywords are found in the log message, their corresponding values will be considered and displayed in the results.
57+
If the log message is in JSON format, the log level detection method searches for the presence of keys such as "level", "Level", "loglevel", "logLevel", "Loglevel", "LogLevel", "log_level", "log-level", "Log_Level", "Log_level", "severity", or "_loglevel". If any of these keys are identified in the log message, their corresponding values will be considered and displayed in the results. If any of these specified log level keys are not found in JSON log messages, the log level detection method falls back to a plain text search for terms like "debug", "info/information", "warn/warning", and "error." But this fallback mechanism can result in false positives, especially when these terms appear in other contexts like encoded data fields.
58+
59+
And if the log message is in a non-JSON format, the log level detection method looks for keywords such as "debug", "info/information", "warn/warning", and "error". If any of these keywords are found in the log message, their corresponding values will be considered and displayed in the results.
5860

5961
:::info
6062
If multiple log levels are detected in the message, they will be prioritized in the following order: ERROR > WARN > INFO > DEBUG.

0 commit comments

Comments
 (0)