Support Inject cluster topology information for am and grafana to etcd in pd #1124

mapleFU · 2020-01-18T15:28:21Z

This pr is related to this technical design: https://docs.google.com/document/d/10YvHeWeXyWbCIbqXJ_TsGV5pwPXJOaOjE8whd4JSJVE/edit

It want to write address of tidb/grafana/tikv into pd using etcd v3 api. It will be done in start and rolling_update phase.

liubo0127 · 2020-01-19T02:32:11Z

rolling_update.yml

@@ -168,6 +168,12 @@
        pd_cert_dir: "{{ pd_cert_dir }}"
      when: pd_leader_name == pd_name

+    - name: init pd cluster topology
+      delegate_to: localhost
+      shell: "python init-pd-topo.py --pd_host {{ pd_host }} --pd_port {{ pd_port }} --tidb_host {{ tidb_host }} --tidb_port {{ tidb_port }} --grafana_host {{ grafana_host }} --grafana_port {{ grafana_port }} --alertmanager_host {{ alertmanager_host }} --alertmanager_port {{ alertmanager_port }}"


In this way, no information other than the pd node can be obtained.

liubo0127 · 2020-01-19T02:34:07Z

Does it need to delete related information from PD through API when deleting nodes?

mapleFU · 2020-01-19T06:21:16Z

Does it need to delete related information from PD through API when deleting nodes?

If the server is down or close, it will not change.
If you call ansible-playbook rolling_update.yml or redeploy it, it will change the nodes.

liubo0127 · 2020-01-19T06:34:34Z

Does it need to delete related information from PD through API when deleting nodes?

If the server is down or close, it will not change.

If you call ansible-playbook rolling_update.yml or redeploy it, it will change the nodes.

How to delete the information stored in PD if a node is deleted from the cluster.

mapleFU · 2020-01-19T06:36:10Z

Does it need to delete related information from PD through API when deleting nodes?

If the server is down or close, it will not change.

If you call ansible-playbook rolling_update.yml or redeploy it, it will change the nodes.

How to delete the information stored in PD if a node is deleted from the cluster.

Because the messages will be store in etcd api, we can visit and find it in dashboard. Ansible may not need to care about it.

start.yml

mapleFU · 2020-02-05T22:57:39Z

I have tested this pr, and it can write value into pd's etcd now. You may see it in 172.16.6.62. Just visit it using:

ETCDCTL_API=3 etcdctl --endpoints="172.16.6.62:2379" get /topo/alertmanager

It's available.

breezewish · 2020-02-07T05:17:51Z

scripts/init-pd-topo.py

+        "key": encoded_key,
+        "value": encoded_value,
+    })
+    req = urllib2.Request('http://' + etcd_url + '/v3/kv/put',


Will this break TLS deployment?

At present, this script does not support TLS, and it needs to be optimized.

@breeswish @liubo0127 maybe we have 2 ways:

install etcd in pip and get it.

Using https.

roles/init_pd_topo/tasks/main.yml

breezewish · 2020-02-07T05:19:19Z

roles/init_pd_topo/tasks/main.yml

+- name: generate init_pd_topo script
+  template:
+    src: "init_pd_topo.sh.j2"
+    dest: "{{ playbook_dir }}/scripts/init-pd-topo.sh"


Should this file being ignored?

It can't be ignored, it will be executed during start, rolling_update operation.

I mean should we put it in .gitignore since it is generated?

This script is generated when the cluster is deployed. I think it does not need to be added to .gitignore

breezewish · 2020-02-07T05:22:49Z

roles/init_pd_topo/templates/init_pd_topo.sh.j2

+  {% set tidb_ip = hostvars[host].ansible_host | default(hostvars[host].inventory_hostname) -%}
+  {% set tidb_port = hostvars[host].tidb_port -%}
+  {% set tidb_path = hostvars[host].deploy_dir -%}
+  {% set _ = all_tidb.append("%s:%s%s" % (tidb_ip, tidb_port, tidb_path)) -%}


how would you parse the string when you put these together?

Parameter values are strings separated by ,.

roles/init_pd_topo/templates/init_pd_topo.sh.j2

Signed-off-by: mapleFU <1506118561@qq.com>

Signed-off-by: mapleFU <1506118561@qq.com> # Conflicts: # roles/dashboard-topo/templates/init_pd_topo.sh.j2

Signed-off-by: mapleFU <1506118561@qq.com>

# Conflicts: # excessive_rolling_update.yml # rolling_update.yml

Signed-off-by: mapleFU <1506118561@qq.com>

mapleFU · 2020-02-24T21:35:09Z

I've test it in "172.16.5.34"
the inventory.ini can be seen here: https://paste.ubuntu.com/p/DNmR53tHhx/

Signed-off-by: mapleFU <1506118561@qq.com>

mapleFU · 2020-02-24T21:52:20Z

Now:

➜  ~ ETCDCTL_API=3 etcdctl --endpoints="172.16.5.34:2312" get /topology --prefix=true 
/topology/alertmanager
{"ip": "172.16.5.34", "binary_path": "/home/pingcap/mapleFU/data", "port": 9093}
/topology/grafana
{"ip": "172.16.5.34", "binary_path": "/home/pingcap/mapleFU/data", "port": 3000}

start.yml

liubo0127

LGTM

…d in pd (pingcap#1124) * [Init] Initialize pr and create scripts for sending request to pd * [ADD] adding scripts to yml * [Replace] replacing with shell arguments * [Try] trying to testing ansible * [Update] Updating script * update * [FIX] fix wrong api * Add deploy path * [ADD] adding another logic loading * [ADD] adding net/deploy * add all pd info * [Update] Change directory name and update etcd write path. Signed-off-by: mapleFU <1506118561@qq.com> * change init-pd-topo to dashboart topo * [Update] Support `port` field. Signed-off-by: mapleFU <1506118561@qq.com> * [Fix] Fixing errors on scripts. Signed-off-by: mapleFU <1506118561@qq.com> * [Final] Trying to fix all the problems Signed-off-by: mapleFU <1506118561@qq.com> * [Update] update port type. Signed-off-by: mapleFU <1506118561@qq.com> * [FIX] fix bugs for tidb-anisble deploy dir Signed-off-by: mapleFU <1506118561@qq.com> * [Update] Wait until testing. Signed-off-by: mapleFU <1506118561@qq.com> * [Revert] Revert unnescessary changes. Signed-off-by: mapleFU <1506118561@qq.com> * [DONE] Finish dev. Signed-off-by: mapleFU <1506118561@qq.com> * Update start.yml * Update start.yml Co-authored-by: liubo <liubo0127@qq.com>

…rafana to etcd in pd (#1196) * Support Inject cluster topology information for am and grafana to etcd in pd (#1124) * [Init] Initialize pr and create scripts for sending request to pd * [ADD] adding scripts to yml * [Replace] replacing with shell arguments * [Try] trying to testing ansible * [Update] Updating script * update * [FIX] fix wrong api * Add deploy path * [ADD] adding another logic loading * [ADD] adding net/deploy * add all pd info * [Update] Change directory name and update etcd write path. Signed-off-by: mapleFU <1506118561@qq.com> * change init-pd-topo to dashboart topo * [Update] Support `port` field. Signed-off-by: mapleFU <1506118561@qq.com> * [Fix] Fixing errors on scripts. Signed-off-by: mapleFU <1506118561@qq.com> * [Final] Trying to fix all the problems Signed-off-by: mapleFU <1506118561@qq.com> * [Update] update port type. Signed-off-by: mapleFU <1506118561@qq.com> * [FIX] fix bugs for tidb-anisble deploy dir Signed-off-by: mapleFU <1506118561@qq.com> * [Update] Wait until testing. Signed-off-by: mapleFU <1506118561@qq.com> * [Revert] Revert unnescessary changes. Signed-off-by: mapleFU <1506118561@qq.com> * [DONE] Finish dev. Signed-off-by: mapleFU <1506118561@qq.com> * Update start.yml * Update start.yml Co-authored-by: liubo <liubo0127@qq.com> * Support Prometheus in for dashboard topology (#1195) * [Support] change tidb-ansible script in tidb-ansible. Signed-off-by: mapleFU <1506118561@qq.com> * [ADD] Adding supports in roles. Signed-off-by: mapleFU <1506118561@qq.com> * [Multiple] pass the first when there is multiple arguments. Co-authored-by: mwish <1506118561@qq.com>

mapleFU added 4 commits January 18, 2020 23:15

[Init] Initialize pr and create scripts for sending request to pd

39cb80d

[ADD] adding scripts to yml

baf1587

[Replace] replacing with shell arguments

45e9e83

[Try] trying to testing ansible

2cabb71

liubo0127 reviewed Jan 19, 2020

View reviewed changes

mapleFU changed the title ~~Support Inject cluster information to etcd in pd~~ [DNM] Support Inject cluster information to etcd in pd Jan 19, 2020

[Update] Updating script

4b5a310

mapleFU force-pushed the dev-pd-s branch from 21a22cf to 4b5a310 Compare February 4, 2020 10:42

update

d1d5b51

liubo0127 reviewed Feb 4, 2020

View reviewed changes

start.yml Outdated Show resolved Hide resolved

[FIX] fix wrong api

79d43b7

mapleFU changed the title ~~[DNM] Support Inject cluster information to etcd in pd~~ Support Inject cluster information to etcd in pd Feb 5, 2020

mapleFU force-pushed the dev-pd-s branch from 57fb79f to 79d43b7 Compare February 5, 2020 22:56

liubo0127 and others added 7 commits February 6, 2020 15:42

Add deploy path

bed3671

Merge branch 'dev-pd-s' of github.com:mapleFU/tidb-ansible into dev-pd-s

c2285b1

[ADD] adding another logic loading

f25203e

Merge branch 'dev-pd-s' of github.com:mapleFU/tidb-ansible into dev-pd-s

712bca3

[ADD] adding net/deploy

dbd534a

add all pd info

cd28f80

Merge branch 'dev-pd-s' of github.com:mapleFU/tidb-ansible into dev-pd-s

2e1a460

breezewish reviewed Feb 7, 2020

View reviewed changes

mapleFU and others added 4 commits February 17, 2020 16:35

[Update] Change directory name and update etcd write path.

619e147

Signed-off-by: mapleFU <1506118561@qq.com>

Merge branch 'dev-pd-s' of github.com:mapleFU/tidb-ansible into dev-pd-s

5b2a3f5

Signed-off-by: mapleFU <1506118561@qq.com> # Conflicts: # roles/dashboard-topo/templates/init_pd_topo.sh.j2

change init-pd-topo to dashboart topo

79b5d99

[Update] Support port field.

7e202f9

Signed-off-by: mapleFU <1506118561@qq.com>

mapleFU added 3 commits February 19, 2020 12:35

Merge branch 'dev-pd-s' of github.com:mapleFU/tidb-ansible into dev-pd-s

8ada8d6

[Fix] Fixing errors on scripts.

88acce9

Signed-off-by: mapleFU <1506118561@qq.com>

[Final] Trying to fix all the problems

41f7ec4

Signed-off-by: mapleFU <1506118561@qq.com>

mapleFU mentioned this pull request Feb 24, 2020

Navigate to Grafana and AlertManager pingcap/tidb-dashboard#55

Closed

mapleFU added 4 commits February 24, 2020 16:54

Merge remote-tracking branch 'upstream/master' into dev-pd-s

28f5b88

# Conflicts: # excessive_rolling_update.yml # rolling_update.yml

[Update] update port type.

c5d5aeb

Signed-off-by: mapleFU <1506118561@qq.com>

[FIX] fix bugs for tidb-anisble deploy dir

4a8eda4

Signed-off-by: mapleFU <1506118561@qq.com>

[Update] Wait until testing.

5b98edf

Signed-off-by: mapleFU <1506118561@qq.com>

mapleFU added 2 commits February 25, 2020 05:36

[Revert] Revert unnescessary changes.

ef8f4b8

Signed-off-by: mapleFU <1506118561@qq.com>

[DONE] Finish dev.

c132415

Signed-off-by: mapleFU <1506118561@qq.com>

mapleFU mentioned this pull request Feb 24, 2020

Report grafana & am address in ansible pingcap/tidb-dashboard#43

Closed

Update start.yml

65e2917

liubo0127 reviewed Feb 25, 2020

View reviewed changes

start.yml Outdated Show resolved Hide resolved

Update start.yml

ca78a8b

liubo0127 approved these changes Feb 25, 2020

View reviewed changes

mapleFU changed the title ~~Support Inject cluster information to etcd in pd~~ Support Inject cluster topology information for am and grafana to etcd in pd Feb 25, 2020

mapleFU merged commit 4164929 into pingcap:master Feb 25, 2020

liubo0127 mentioned this pull request Mar 5, 2020

release-4.0: Support Inject cluster topology information for am and grafana to etcd in pd #1196

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Inject cluster topology information for am and grafana to etcd in pd #1124

Support Inject cluster topology information for am and grafana to etcd in pd #1124

mapleFU commented Jan 18, 2020

liubo0127 Jan 19, 2020

liubo0127 commented Jan 19, 2020

mapleFU commented Jan 19, 2020

liubo0127 commented Jan 19, 2020

mapleFU commented Jan 19, 2020

mapleFU commented Feb 5, 2020 •

edited

Loading

breezewish Feb 7, 2020

liubo0127 Feb 9, 2020

mapleFU Feb 10, 2020

breezewish Feb 7, 2020

liubo0127 Feb 9, 2020

breezewish Feb 9, 2020

liubo0127 Feb 10, 2020

breezewish Feb 7, 2020

liubo0127 Feb 9, 2020

mapleFU commented Feb 24, 2020

mapleFU commented Feb 24, 2020

liubo0127 left a comment

Support Inject cluster topology information for am and grafana to etcd in pd #1124

Support Inject cluster topology information for am and grafana to etcd in pd #1124

Conversation

mapleFU commented Jan 18, 2020

Choose a reason for hiding this comment

liubo0127 commented Jan 19, 2020

mapleFU commented Jan 19, 2020

liubo0127 commented Jan 19, 2020

mapleFU commented Jan 19, 2020

mapleFU commented Feb 5, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mapleFU commented Feb 24, 2020

mapleFU commented Feb 24, 2020

liubo0127 left a comment

Choose a reason for hiding this comment

mapleFU commented Feb 5, 2020 •

edited

Loading