Skip to content

Commit afdd083

Browse files
cgiraldocgiraldo
authored
Merge pull request #24 from nvtkaszpir/opentsdb-bump
Opentsdb update
2 parents baa0789 + db31d5a commit afdd083

File tree

5 files changed

+83
-39
lines changed

5 files changed

+83
-39
lines changed

‎charts/opentsdb/Chart.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
apiVersion: v1
2-
appVersion: "2.3.1"
2+
appVersion: "2.4.0" # notice that this is not used anywhere, see vaules.yaml image.tag
33
description: >
44
Store and serve massive amounts of time series data without losing
55
granularity.
6-
home: http://opentsdb.net/
6+
home: https://github.com/Gradiant/charts
7+
sources:
8+
- http://opentsdb.net/
9+
- https://github.com/Gradiant/charts
10+
- https://github.com/Gradiant/dockerized-opentsdb
711
icon: http://opentsdb.net/img/logo_header.png
812
maintainers:
913
- email: [email protected]
1014
name: cgiraldo
1115
name: opentsdb
12-
version: 0.1.2
16+
version: 0.1.3
17+
keywords:
18+
- hadoop
19+
- hbase
20+
- hdfs
21+
- opentsdb
22+
- zookeeper

‎charts/opentsdb/README.md

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ opentsdb
22
========
33
Store and serve massive amounts of time series data without losing granularity.
44

5+
Current chart version is `0.1.3`
56

6-
Current chart version is `0.1.0`
7-
8-
Source code can be found [here](http://opentsdb.net/)
9-
7+
Source code can be found [here](https://github.com/Gradiant/charts)
108

119
## Installing the Chart
1210

@@ -22,6 +20,8 @@ To install the chart with the release name `opentsdb`.
2220
$ helm install --name opentsdb gradiant/opentsdb
2321
```
2422

23+
For more detailed custom values.yaml file see `ci/custom-values.yaml`
24+
2525
## Chart Requirements
2626

2727
| Repository | Name | Version |
@@ -32,23 +32,21 @@ $ helm install --name opentsdb gradiant/opentsdb
3232

3333
| Key | Type | Default | Description |
3434
|-----|------|---------|-------------|
35-
| antiAffinity | string | `"soft"` | |
36-
| conf."tsd.core.auto_create_metrics" | bool | `true` | |
37-
| conf."tsd.core.auto_create_tagks" | bool | `true` | |
38-
| conf."tsd.core.auto_create_tagvs" | bool | `true` | |
39-
| conf."tsd.storage.hbase.zk_quorum" | string | `nil` | |
40-
| daemons | int | `1` | |
41-
| hbase.enabled | bool | `true` | |
42-
| hbaseConfigMapName | string | `nil` | |
43-
| hbaseImage.repository | string | `"gradiant/hbase-base"` | |
44-
| hbaseImage.tag | string | `"2.0.1"` | |
35+
| antiAffinity | string | `"soft"` | Select antiAffinity as either hard or soft, default is 'soft' 'hard' is for production setups |
36+
| conf | object | `{"tsd.core.auto_create_metrics":true,"tsd.core.auto_create_tagks":true,"tsd.core.auto_create_tagvs":true,"tsd.storage.hbase.zk_quorum":null}` | configure /etc/opentsdb/opentsdb.conf contents |
37+
| daemons | int | `1` | Initial number of tsd replicas |
38+
| env.init | object | `{"COMPRESSION":"GZ"}` | values for init container when creating hbase tables |
39+
| env.opentsdb | string | `nil` | env values to pass to opentsdb, for example JAVA_OPTS |
40+
| hbase | object | `{"enabled":true}` | pass vars towards hbase chart, from dependencies |
41+
| hbase.enabled | bool | `true` | set to 'false' to disable automatically deploying dependent charts |
42+
| hbaseConfigMapName | string | `nil` | name of the configmap used to fetch hbase configuration default hbaseConfigMapName is {{ .Release.Name}}-hbase |
43+
| hbaseImage | object | `{"repository":"gradiant/hbase-base","tag":"2.0.1"}` | container umage used to run hbase client shell to create initial opentsdb tables |
4544
| image.pullPolicy | string | `"IfNotPresent"` | |
4645
| image.repository | string | `"gradiant/opentsdb"` | |
4746
| image.tag | string | `"2.4.0"` | |
48-
| nodePort.enabled | bool | `false` | |
49-
| nodePort.externalPort | int | `31042` | |
50-
| port | int | `4242` | |
51-
| resources.limits.cpu | string | `"1000m"` | |
52-
| resources.limits.memory | string | `"2048Mi"` | |
53-
| resources.requests.cpu | string | `"10m"` | |
54-
| resources.requests.memory | string | `"256Mi"` | |
47+
| init_hbase_script | string | `"create '$UID_TABLE',\n{NAME => 'id', COMPRESSION => '$COMPRESSION', BLOOMFILTER => '$BLOOMFILTER'},\n{NAME => 'name', COMPRESSION => '$COMPRESSION', BLOOMFILTER => '$BLOOMFILTER'}\ncreate '$TSDB_TABLE',\n{NAME => 't', VERSIONS => 1, COMPRESSION => '$COMPRESSION', BLOOMFILTER => '$BLOOMFILTER'}\ncreate '$TREE_TABLE',\n{NAME => 't', VERSIONS => 1, COMPRESSION => '$COMPRESSION', BLOOMFILTER => '$BLOOMFILTER'}\ncreate '$META_TABLE',\n{NAME => 'name', COMPRESSION => '$COMPRESSION', BLOOMFILTER => '$BLOOMFILTER'}\n"` | hbase init script to create hbase tables, where $VARS are env vars from env.init (above), if empty then default will be used |
48+
| logback | object | `{"level_conn_mgr":"WARN","level_core":"INFO","level_graph":"INFO","level_graph_handler":"WARN","level_hbase":"WARN","level_meta":"INFO","level_query":"WARN","level_querylog":"WARN","level_root":"DEBUG","level_search":"INFO","level_stats":"INFO","level_stumbleupon":"WARN","level_tools":"INFO","level_tree":"INFO","level_treshold":"WARN","level_tsd":"INFO","level_uid":"INFO","level_utils":"INFO","pattern":"%d{ISO8601} %-5level [%thread] %logger{0}: %msg%n"}` | configure /etc/opentsdb/logback.xml contents for more detailed logging |
49+
| nodePort.enabled | bool | `false` | set to 'true' to change to nodeport instead of ClusterIP |
50+
| nodePort.externalPort | int | `31042` | sport to use to expose service |
51+
| port | int | `4242` | expose port when using nodePort |
52+
| resources | object | `{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"10m","memory":"256Mi"}}` | container resource requests and limits |

‎charts/opentsdb/README.md.gotmpl

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{{ template "chart.header" . }}
2+
{{ template "chart.description" . }}
3+
{{ template "chart.versionLine" . }}
4+
5+
{{ template "chart.sourceLinkLine" . }}
6+
7+
## Installing the Chart
8+
9+
Add gradiant helm repo:
10+
11+
```
12+
helm repo add gradiant https://gradiant.github.io/charts
13+
```
14+
15+
To install the chart with the release name `opentsdb`.
16+
17+
```
18+
$ helm install --name opentsdb gradiant/opentsdb
19+
```
20+
21+
For more detailed custom values.yaml file see `ci/custom-values.yaml`
22+
23+
{{ template "chart.requirementsSection" . }}
24+
25+
{{ template "chart.valuesSection" . }}

‎charts/opentsdb/ci/basic.yaml

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

‎charts/opentsdb/values.yaml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,43 @@
1-
# Default values for hbase
1+
# Default values for opentsdb
22
# This is a YAML-formatted file.
33
# Declare variables to be passed into your templates.
44

5-
# The base hadoop image to use for all components.
6-
# See this repo for image build details: https://github.com/Comcast/kube-yarn/tree/master/image
5+
# image - The base opentsdb image to use for all components.
6+
# for default see https://github.com/Gradiant/dockerized-opentsdb
77
image:
88
repository: gradiant/opentsdb
99
tag: 2.4.0
1010
pullPolicy: IfNotPresent
1111

12-
# Just to use hbase client shell to create initial opentsdb tables
12+
# hbaseImage -- container umage used to run hbase client shell to create
13+
# initial opentsdb tables
1314
hbaseImage:
1415
repository: gradiant/hbase-base
1516
tag: 2.0.1
1617

17-
hbaseConfigMapName: # Default hbaseConfigMapName is {{ .Release.Name}}-hbase
18+
# hbaseConfigMapName -- name of the configmap used to fetch hbase configuration
19+
# default hbaseConfigMapName is {{ .Release.Name}}-hbase
20+
hbaseConfigMapName:
1821

19-
# Select antiAffinity as either hard or soft, default is 'soft'
22+
# antiAffinity -- Select antiAffinity as either hard or soft, default is 'soft'
2023
# 'hard' is for production setups
2124
antiAffinity: "soft"
2225

23-
# Initial number of tsd replicas
26+
# daemons -- Initial number of tsd replicas
2427
daemons: 1
28+
# port -- expose port when using nodePort
2529
port: 4242
30+
2631
nodePort:
32+
# nodePort.enabled -- set to 'true' to change to nodeport instead of ClusterIP
2733
enabled: false
34+
# nodePort.externalPort -- sport to use to expose service
2835
externalPort: 31042
2936

3037
# pass env vars to the opentsdb or init-container
3138
env:
32-
init: # env values for init container
39+
# env.init -- values for init container when creating hbase tables
40+
init:
3341
# BLOOMFILTER: 'ROW'
3442
# META_TABLE: 'tsdb-meta'
3543
# TREE_TABLE: 'tsdb-tree'
@@ -38,9 +46,11 @@ env:
3846
COMPRESSION: "GZ" # Use one of LZO ZSTD GZ LZ4 NONE Algorithm BZIP2 SNAPPY
3947
# TSDB_TTL: 'FOREVER'
4048
# DATA_BLOCK_ENCODING: 'DIFF'
49+
# env.opentsdb -- env values to pass to opentsdb, for example JAVA_OPTS
4150
opentsdb:
4251

43-
# hbase init script to create hbase tables, where $VARS are env vars from env.init (above), if empty then default will be used
52+
# init_hbase_script -- hbase init script to create hbase tables,
53+
# where $VARS are env vars from env.init (above), if empty then default will be used
4454
init_hbase_script: |
4555
create '$UID_TABLE',
4656
{NAME => 'id', COMPRESSION => '$COMPRESSION', BLOOMFILTER => '$BLOOMFILTER'},
@@ -52,9 +62,10 @@ init_hbase_script: |
5262
create '$META_TABLE',
5363
{NAME => 'name', COMPRESSION => '$COMPRESSION', BLOOMFILTER => '$BLOOMFILTER'}
5464
55-
# configure /etc/opentsdb/opentsdb.conf contents
65+
# conf -- configure /etc/opentsdb/opentsdb.conf contents
5666
conf:
57-
tsd.storage.hbase.zk_quorum: # default is "{{.Release.Name}}-zookeeper:2181"
67+
# tsd.storage.hbase.zk_quorum -- default is "{{.Release.Name}}-zookeeper:2181"
68+
tsd.storage.hbase.zk_quorum:
5869
tsd.core.auto_create_metrics: true
5970
tsd.core.auto_create_tagks: true
6071
tsd.core.auto_create_tagvs: true
@@ -63,7 +74,7 @@ conf:
6374
# tsd.storage.hbase.tree_table: tsdb-tree
6475
# tsd.storage.hbase.uid_table: tsdb-uid
6576

66-
# configure /etc/opentsdb/logback.xml contents
77+
# logback -- configure /etc/opentsdb/logback.xml contents for more detailed logging
6778
logback:
6879
level_root: "DEBUG" # main java logger level
6980
level_treshold: "WARN" # change to INFO to see more in the logs itself
@@ -85,6 +96,7 @@ logback:
8596
level_utils: "INFO"
8697
pattern: "%d{ISO8601} %-5level [%thread] %logger{0}: %msg%n"
8798

99+
# resources -- container resource requests and limits
88100
resources:
89101
requests:
90102
memory: "256Mi"
@@ -93,6 +105,7 @@ resources:
93105
memory: "2048Mi"
94106
cpu: "1000m"
95107

96-
# manage hbase from dependencies
108+
# hbase -- pass vars towards hbase chart, from dependencies
97109
hbase:
110+
# hbase.enabled -- set to 'false' to disable automatically deploying dependent charts
98111
enabled: true

0 commit comments

Comments
 (0)