Skip to content
This repository has been archived by the owner on Dec 1, 2018. It is now read-only.

fix docs&&misc about delete pod_namespace #1661

Merged
merged 1 commit into from
May 31, 2017
Merged

fix docs&&misc about delete pod_namespace #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions common/elasticsearch/mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,6 @@ func customMetricTypeSchema(typeName string, customSchema string) string {
}
}
},
"pod_namespace": {
"type": "string",
"fields": {
"raw": {
"type": "string",
"index": "not_analyzed"
}
}
},
"resource_id": {
"type": "string",
"index": "not_analyzed"
Expand Down
7 changes: 4 additions & 3 deletions docs/storage-schema.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@ Heapster tags each metric with the following labels.
|----------------|-------------------------------------------------------------------------------|
| pod_id | Unique ID of a Pod |
| pod_name | User-provided name of a Pod |
| pod_namespace | The namespace of a Pod |
| container_base_image | Base image for the container |
| container_base_image | Base image for the container |
| container_name | User-provided name of the container or full cgroup name for system containers |
| host_id | Cloud-provider specified or user specified Identifier of a node |
| hostname | Hostname where the container ran |
| nodename | Nodename where the container ran |
| labels | Comma-separated(Default) list of user-provided labels. Format is 'key:value' |
| namespace_id | UID of the namespace of a Pod |
| resource_id | A unique identifier used to differentiate multiple metrics of the same type. e.x. Fs partitions under filesystem/usage |
| namespace_name | User-provided name of a Namespace |
| resource_id | A unique identifier used to differentiate multiple metrics of the same type. e.x. Fs partitions under filesystem/usage |

**Note**
* Label separator can be configured with Heapster `--label-seperator`. Comma-seperated label pairs is fine until we use [Bosun](http://bosun.org) as alert system and use `group by labels` to search for labels.
Expand Down
2 changes: 1 addition & 1 deletion grafana/dashboards/influxdb_withfields/pods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@
"selected": false
}
],
"query": "SHOW TAG VALUES FROM \"uptime\" WITH KEY = \"pod_name\" WHERE \"pod_namespace\" =~ /$namespace$/",
"query": "SHOW TAG VALUES FROM \"uptime\" WITH KEY = \"pod_name\" WHERE \"namespace_name\" =~ /$namespace$/",
"refresh": true,
"regex": "",
"type": "query"
Expand Down
2 changes: 1 addition & 1 deletion grafana/dashboards/pods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@
"selected": false
}
],
"query": "SHOW TAG VALUES FROM \"uptime\" WITH KEY = \"pod_name\" WHERE \"pod_namespace\" =~ /$namespace$/",
"query": "SHOW TAG VALUES FROM \"uptime\" WITH KEY = \"pod_name\" WHERE \"namespace_name\" =~ /$namespace$/",
"refresh": true,
"regex": "",
"type": "query"
Expand Down
1 change: 0 additions & 1 deletion metrics/sinks/opentsdb/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ var (
"name": "redis",
"io.kubernetes.pod.name": "default/redis-test",
"pod_id": fakePodUid,
"pod_namespace": "default",
"pod_name": fakePodName,
"container_name": "redis",
"container_base_image": "kubernetes/redis:v1",
Expand Down