Skip to content

Commit 59173e3

Browse files
Merge branch 'master' into updates-for-4.4
Signed-off-by: Robert Fekete <fekete77.robert@gmail.com>
2 parents 62ca8d5 + b3c5231 commit 59173e3

File tree

6 files changed

+76
-26
lines changed

6 files changed

+76
-26
lines changed

config/_default/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ twitter = "calisti12"
4848

4949
# email = ""
5050

51-
copyright = "kube-logging authors"
51+
copyright = "kube-logging authors | "
5252

5353
relativeURLs = true
5454

content/_index.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The Logging operator <b>manages the log collectors and log forwarders</b> of you
6161
</div>
6262
{{% /blocks/lead %}}
6363

64-
{{< blocks/section color="dark" type="features">}}
64+
{{< blocks/section color="primary" type="features">}}
6565
{{% blocks/feature icon="fa-lightbulb" title="Learn more about Logging operator!" url="/docs/" %}}
6666
Read the Logging operator documentation.
6767
{{% /blocks/feature %}}
@@ -74,3 +74,11 @@ We do a [Pull Request](https://github.com/kube-logging/logging-operator/pulls) c
7474
In case you need help, you can find on <a href="https://join.slack.com/t/emergingtechcommunity/shared_invite/zt-1rw2jl0ht-yNdyFgBFlc%7Eyzo9AnE4FbA">Slack</a> and <a href="https://discord.gg/9ACY4RDsYN">Discord</a>.
7575
{{% /blocks/feature %}}
7676
{{< /blocks/section >}}
77+
78+
{{% blocks/lead color="dark" %}}
79+
<div class="lead-text">
80+
<p>We are a <a href="https://www.cncf.io/projects/">Cloud Native Computing Foundation sandbox project</a>.</p>
81+
82+
<a href="https://www.cncf.io/" target="_blank"><img src="https://raw.githubusercontent.com/cncf/artwork/master/other/cncf/horizontal/white/cncf-white.svg" width="33%"></img></a>
83+
</div>
84+
{{% /blocks/lead %}}

content/docs/configuration/plugins/filters/parser.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -239,121 +239,121 @@ Default: -
239239

240240
## Parse Section (single)
241241

242-
### type (string, optional) {#parse section-(single)-type}
242+
### type (string, optional) {#parse-section-type}
243243

244244
Parse type: apache2, apache_error, nginx, syslog, csv, tsv, ltsv, json, multiline, none, logfmt, grok, multiline_grok
245245

246246
Default: -
247247

248-
### expression (string, optional) {#parse section-(single)-expression}
248+
### expression (string, optional) {#parse-section-expression}
249249

250250
Regexp expression to evaluate
251251

252252
Default: -
253253

254-
### time_key (string, optional) {#parse section-(single)-time_key}
254+
### time_key (string, optional) {#parse-section-time_key}
255255

256256
Specify time field for event time. If the event doesn't have this field, current time is used.
257257

258258
Default: -
259259

260-
### null_value_pattern (string, optional) {#parse section-(single)-null_value_pattern}
260+
### null_value_pattern (string, optional) {#parse-section-null_value_pattern}
261261

262262
Specify null value pattern.
263263

264264
Default: -
265265

266-
### null_empty_string (bool, optional) {#parse section-(single)-null_empty_string}
266+
### null_empty_string (bool, optional) {#parse-section-null_empty_string}
267267

268268
If true, empty string field is replaced with nil
269269

270270
Default: -
271271

272-
### estimate_current_event (bool, optional) {#parse section-(single)-estimate_current_event}
272+
### estimate_current_event (bool, optional) {#parse-section-estimate_current_event}
273273

274274
If true, use Fluent::EventTime.now(current time) as a timestamp when time_key is specified.
275275

276276
Default: -
277277

278-
### keep_time_key (bool, optional) {#parse section-(single)-keep_time_key}
278+
### keep_time_key (bool, optional) {#parse-section-keep_time_key}
279279

280280
If true, keep time field in the record.
281281

282282
Default: -
283283

284-
### types (string, optional) {#parse section-(single)-types}
284+
### types (string, optional) {#parse-section-types}
285285

286286
Types casting the fields to proper types example: field1:type, field2:type
287287

288288
Default: -
289289

290-
### time_format (string, optional) {#parse section-(single)-time_format}
290+
### time_format (string, optional) {#parse-section-time_format}
291291

292292
Process value using specified format. This is available only when time_type is string
293293

294294
Default: -
295295

296-
### time_type (string, optional) {#parse section-(single)-time_type}
296+
### time_type (string, optional) {#parse-section-time_type}
297297

298298
Parse/format value according to this type available values: float, unixtime, string
299299

300300
Default: string
301301

302-
### local_time (bool, optional) {#parse section-(single)-local_time}
302+
### local_time (bool, optional) {#parse-section-local_time}
303303

304304
Ff true, use local time. Otherwise, UTC is used. This is exclusive with utc.
305305

306306
Default: true
307307

308-
### utc (bool, optional) {#parse section-(single)-utc}
308+
### utc (bool, optional) {#parse-section-utc}
309309

310310
If true, use UTC. Otherwise, local time is used. This is exclusive with localtime
311311

312312
Default: false
313313

314-
### timezone (string, optional) {#parse section-(single)-timezone}
314+
### timezone (string, optional) {#parse-section-timezone}
315315

316316
Use specified timezone. one can parse/format the time value in the specified timezone.
317317

318318
Default: nil
319319

320-
### format (string, optional) {#parse section-(single)-format}
320+
### format (string, optional) {#parse-section-format}
321321

322322
Only available when using type: multi_format
323323

324324
Default: -
325325

326-
### grok_pattern (string, optional) {#parse section-(single)-grok_pattern}
326+
### grok_pattern (string, optional) {#parse-section-grok_pattern}
327327

328328
Only available when using format: grok, multiline_grok. The pattern of grok. You cannot specify multiple grok pattern with this.
329329

330330
Default: -
331331

332-
### custom_pattern_path (*secret.Secret, optional) {#parse section-(single)-custom_pattern_path}
332+
### custom_pattern_path (*secret.Secret, optional) {#parse-section-custom_pattern_path}
333333

334334
Only available when using format: grok, multiline_grok. File that includes custom grok patterns.
335335

336336
Default: -
337337

338-
### grok_failure_key (string, optional) {#parse section-(single)-grok_failure_key}
338+
### grok_failure_key (string, optional) {#parse-section-grok_failure_key}
339339

340340
Only available when using format: grok, multiline_grok. The key has grok failure reason.
341341

342342
Default: -
343343

344-
### grok_name_key (string, optional) {#parse section-(single)-grok_name_key}
344+
### grok_name_key (string, optional) {#parse-section-grok_name_key}
345345

346346
Only available when using format: grok, multiline_grok. The key name to store grok section's name.
347347

348348
Default: -
349349

350-
### multiline_start_regexp (string, optional) {#parse section-(single)-multiline_start_regexp}
350+
### multiline_start_regexp (string, optional) {#parse-section-multiline_start_regexp}
351351

352352
Only available when using format: multiline_grok The regexp to match beginning of multiline.
353353

354354
Default: -
355355

356-
### grok_patterns ([]GrokSection, optional) {#parse section-(single)-grok_patterns}
356+
### grok_patterns ([]GrokSection, optional) {#parse-section-grok_patterns}
357357

358358
Only available when using format: grok, multiline_grok. [Grok Section](#grok-section) Specify grok pattern series set.
359359

content/docs/configuration/plugins/filters/record_modifier.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ spec:
8080

8181
Specify replace rule. This directive contains three parameters.
8282

83-
### key (string, required) {#[replace directive](https://github.com/repeatedly/fluent-plugin-record-modifier#replace_keys_value)-key}
83+
### key (string, required) {#replace-directive-replace_keys_value-key}
8484

8585
Key to search for
8686

8787
Default: -
8888

89-
### expression (string, required) {#[replace directive](https://github.com/repeatedly/fluent-plugin-record-modifier#replace_keys_value)-expression}
89+
### expression (string, required) {#replace-directive-replace_keys_value-expression}
9090

9191
Regular expression
9292

9393
Default: -
9494

95-
### replace (string, required) {#[replace directive](https://github.com/repeatedly/fluent-plugin-record-modifier#replace_keys_value)-replace}
95+
### replace (string, required) {#replace-directive-replace_keys_value-replace}
9696

9797
Value to replace with
9898

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
2-
title: Fluentd Outputs
2+
title: Fluentd outputs
33
---
44

layouts/partials/footer.html

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!-- Copied from Docsy to add textual links because https://github.com/google/docsy/pull/1500 is not merged yet -->
2+
3+
{{ $links := .Site.Params.links }}
4+
<footer class="bg-dark py-5 row d-print-none">
5+
<div class="container-fluid mx-sm-5">
6+
<div class="row">
7+
<div class="col-6 col-sm-4 text-xs-center order-sm-2">
8+
{{ with $links }}
9+
{{ with index . "user"}}
10+
{{ template "footer-links-block" . }}
11+
{{ end }}
12+
{{ end }}
13+
</div>
14+
<div class="col-6 col-sm-4 text-right text-xs-center order-sm-3">
15+
{{ with $links }}
16+
{{ with index . "developer"}}
17+
{{ template "footer-links-block" . }}
18+
{{ end }}
19+
{{ end }}
20+
</div>
21+
<div class="col-12 col-sm-4 text-center py-2 order-sm-2">
22+
<small class="text-white"><a class="text-white" href="https://www.linuxfoundation.org/trademark-usage/">Trademark Usage</a> | </small>
23+
{{ with .Site.Params.copyright }}<small class="text-white">&copy; {{ now.Year}} {{ .}} {{ T "footer_all_rights_reserved" }}</small>{{ end }}
24+
{{ with .Site.Params.privacy_policy }}<small class="ml-1"><a href="{{ . }}" target="_blank" rel="noopener">{{ T "footer_privacy_policy" }}</a></small>{{ end }}
25+
{{ if not .Site.Params.ui.footer_about_disable }}
26+
{{ with .Site.GetPage "about" }}<p class="mt-2"><a href="{{ .RelPermalink }}">{{ .Title }}</a></p>{{ end }}
27+
{{ end }}
28+
</div>
29+
</div>
30+
</div>
31+
</footer>
32+
{{ define "footer-links-block" }}
33+
<ul class="list-inline mb-0">
34+
{{ range . }}
35+
<li class="list-inline-item mx-2 h3" data-toggle="tooltip" data-placement="top" title="{{ .name }}" aria-label="{{ .name }}">
36+
<a class="text-white" target="_blank" rel="noopener" href="{{ .url }}" aria-label="{{ .name }}">
37+
<i class="{{ .icon }}"></i>
38+
</a>
39+
</li>
40+
{{ end }}
41+
</ul>
42+
{{ end }}

0 commit comments

Comments
 (0)