Skip to content

Fix elastic search index name for ExecutionStatus #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2020
Merged

Fix elastic search index name for ExecutionStatus #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f834be
Fix elastic search index name for ExecutionStatus
samarabbas Jul 15, 2020
62a1a9a
remove unused image reference
samarabbas Jul 15, 2020
9e7e382
update index types in ES to match Temporal data model
samarabbas Jul 15, 2020
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
7 changes: 4 additions & 3 deletions config/dynamicconfig/development_es.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ frontend.validSearchAttributes:
StartTime: "Int"
Copy link
Member

@mastermanu mastermanu Jul 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the index_template.json has this as a long. Same with executiontime and closetime and customintfield

Copy link
Contributor Author

@samarabbas samarabbas Jul 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like proto definition only defines the following four types:

message Field {
    temporal.server.api.enums.v1.FieldType type = 1;
    oneof data {
        string string_data = 2;
        int64 int_data = 3;
        bool bool_data = 4;
        bytes binary_data = 5;
    }
}

Copy link
Member

@mastermanu mastermanu Jul 15, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, then maybe we should just fix up index_template to use integer then (or maybe switch all of them to long if proto is int64)

Copy link
Contributor Author

@samarabbas samarabbas Jul 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

ExecutionTime: "Int"
CloseTime: "Int"
Status: "Int"
ExecutionStatus: "Int"
HistoryLength: "Int"
TaskQueue: "Keyword"
CustomStringField: "String"
Expand All @@ -22,6 +22,8 @@ frontend.validSearchAttributes:
CustomDoubleField: "Double"
CustomBoolField: "Bool"
CustomDatetimeField: "Datetime"
TemporalChangeVersion: "Keyword"
BinaryChecksums: "Keyword"
project: "Keyword"
service: "Keyword"
environment: "Keyword"
Expand All @@ -31,7 +33,6 @@ frontend.validSearchAttributes:
CustomNamespace: "Keyword"
Operator: "Keyword"
RolloutId: "Keyword"
TemporalChangeVersion: "Keyword"
BinaryChecksums: "Keyword"

system.minRetentionDays:
- value: 0
6 changes: 6 additions & 0 deletions docker/dependencies/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ services:
- temporal-dependencies-network
elasticsearch:
image: elasticsearch:6.8.8
# Make ES available both on _local_ and _site_,
# and use use _local_ for the publish_host.
#
# See here for details on network configuration:
# https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-network.html
command: elasticsearch -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_
container_name: temporal-elasticsearch
ports:
- "9200:9200"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/olekukonko/tablewriter v0.0.4
github.com/olivere/elastic v6.2.32+incompatible
github.com/olivere/elastic v6.2.34+incompatible
github.com/onsi/ginkgo v1.10.3 // indirect
github.com/onsi/gomega v1.7.1 // indirect
github.com/pborman/uuid v1.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
github.com/olivere/elastic v6.2.32+incompatible h1:xieFzqQcQzxMmP5fb8LP+Ayk6Ap02fs72EO5/wEjCuE=
github.com/olivere/elastic v6.2.32+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
github.com/olivere/elastic v6.2.34+incompatible h1:GdvWBAqyIyEEUd+J2sSj6EnIaBywz7zZtN+Ps4JCv0g=
github.com/olivere/elastic v6.2.34+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down
4 changes: 2 additions & 2 deletions schema/elasticsearch/visibility/index_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"type": "long"
},
"ExecutionStatus": {
"type": "integer"
"type": "long"
},
"HistoryLength": {
"type": "integer"
"type": "long"
},
"KafkaKey": {
"type": "keyword"
Expand Down