Skip to content

Commit a7d7603

Browse files
authored
Cleanup the leftovers of the old k8s implementation (#2676)
Signed-off-by: MOZGIII <mike-n@narod.ru>
1 parent 92ce879 commit a7d7603

9 files changed

Lines changed: 5 additions & 133 deletions

File tree

.meta/.schemas/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
},
244244
"permission": {
245245
"type": "object",
246-
"description": "A Vector permission, such as a AWS IAM, GCP IAM, or Kubernetes RBAC permission.",
246+
"description": "A Vector permission, such as a AWS IAM or GCP IAM.",
247247
"additionalProperties": false,
248248
"required": ["description", "name"],
249249
"properties": {

.meta/data_model/log.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ the source-level `timestamp_key` option for relevant sources.
3232

3333
[data_model.log.schema.source_type]
3434
type = "string"
35-
examples = ["file", "socket", "http", "kubernetes"]
35+
examples = ["file", "socket", "http"]
3636
required = false
3737
description = """\
3838
The official `type` of [Vector's source component][docs.sources] from which \

.meta/options.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ The key used to represent when the log was generated. See the \
5151
[log data model page][docs.data-model.log#timestamp] for more info.\
5252
"""
5353

54-
[options.log_schema.children.kubernetes_key]
55-
type = "string"
56-
default = "kubernetes"
57-
examples = ["kubernetes", "kube", "k8s"]
58-
description = "The key under which Kubernetes related fields are nested."
59-
6054
[options.log_schema.children.source_type_key]
6155
type = "string"
6256
default = "source_type"

config/vector.spec.toml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,6 @@ dns_servers = ["0.0.0.0:53"]
6161
host_key = "instance"
6262
host_key = "machine"
6363

64-
# The key under which Kubernetes related fields are nested.
65-
#
66-
# * optional
67-
# * default: "kubernetes"
68-
# * type: string
69-
kubernetes_key = "kubernetes"
70-
kubernetes_key = "kube"
71-
kubernetes_key = "k8s"
72-
7364
# The key used to hold the log message. See the log data model page for more
7465
# info.
7566
#

src/event/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ lazy_static! {
3232
message_key: Atom::from("message"),
3333
timestamp_key: Atom::from("timestamp"),
3434
host_key: Atom::from("host"),
35-
kubernetes_key: Atom::from("kubernetes"),
3635
source_type_key: Atom::from("source_type"),
3736
};
3837
}
@@ -228,8 +227,6 @@ pub struct LogSchema {
228227
#[serde(default = "LogSchema::default_host_key")]
229228
#[getset(get = "pub", set = "pub(crate)")]
230229
host_key: Atom,
231-
#[getset(get = "pub", set = "pub(crate)")]
232-
kubernetes_key: Atom,
233230
#[serde(default = "LogSchema::default_source_type_key")]
234231
#[getset(get = "pub", set = "pub(crate)")]
235232
source_type_key: Atom,
@@ -241,7 +238,6 @@ impl Default for LogSchema {
241238
message_key: Atom::from("message"),
242239
timestamp_key: Atom::from("timestamp"),
243240
host_key: Atom::from("host"),
244-
kubernetes_key: Atom::from("kubernetes"),
245241
source_type_key: Atom::from("source_type"),
246242
}
247243
}

src/topology/config/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,6 @@ mod test {
582582
host_key = "this"
583583
message_key = "that"
584584
timestamp_key = "then"
585-
kubernetes_key = "when"
586585
587586
[sources.in]
588587
type = "file"
@@ -599,10 +598,6 @@ mod test {
599598
assert_eq!("this", config.global.log_schema.host_key().to_string());
600599
assert_eq!("that", config.global.log_schema.message_key().to_string());
601600
assert_eq!("then", config.global.log_schema.timestamp_key().to_string());
602-
assert_eq!(
603-
"when",
604-
config.global.log_schema.kubernetes_key().to_string()
605-
);
606601
}
607602

608603
#[test]

website/docs/about/data-model/log.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
last_modified_on: "2020-05-01"
2+
last_modified_on: "2020-05-25"
33
title: Log Event
44
description: A detailed guide on Vector's internal log data model.
55
---
@@ -144,7 +144,7 @@ source-level `message_key` option for relevant sources.
144144
common={false}
145145
defaultValue={null}
146146
enumValues={null}
147-
examples={["file","socket","http","kubernetes"]}
147+
examples={["file","socket","http"]}
148148
groups={[]}
149149
name={"source_type"}
150150
path={null}

website/docs/reference/global-options.md

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
last_modified_on: "2020-05-01"
2+
last_modified_on: "2020-05-25"
33
title: Global Options
44
description: "Vector's global options, allowing you configure global Vector-wide behavior."
55
---
@@ -28,7 +28,6 @@ dns_servers = ["0.0.0.0:53"] # optional, no default
2828

2929
# Log schema
3030
log_schema.host_key = "host" # optional, default
31-
log_schema.kubernetes_key = "kubernetes" # optional, default
3231
log_schema.message_key = "message" # optional, default
3332
log_schema.source_type_key = "source_type" # optional, default
3433
log_schema.timestamp_key = "timestamp" # optional, default
@@ -132,29 +131,6 @@ page][docs.data-model.log#host] for more info.
132131

133132

134133

135-
</Field>
136-
<Field
137-
common={false}
138-
defaultValue={"kubernetes"}
139-
enumValues={null}
140-
examples={["kubernetes","kube","k8s"]}
141-
groups={[]}
142-
name={"kubernetes_key"}
143-
path={"log_schema"}
144-
relevantWhen={null}
145-
required={false}
146-
templateable={false}
147-
type={"string"}
148-
unit={null}
149-
warnings={[]}
150-
>
151-
152-
#### kubernetes_key
153-
154-
The key under which Kubernetes related fields are nested.
155-
156-
157-
158134
</Field>
159135
<Field
160136
common={false}

website/docs/reference/transforms/kubernetes_pod_metadata.md.erb.bak

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)