diff --git a/make/harbor.yml.tmpl b/make/harbor.yml.tmpl index c9c9b990a..d217d56d7 100644 --- a/make/harbor.yml.tmpl +++ b/make/harbor.yml.tmpl @@ -245,7 +245,8 @@ proxy: # # url_path: /v1/traces # # compression: false # # insecure: true -# # timeout: 10s +# # # timeout is in seconds +# # timeout: 10 # Enable purge _upload directories upload_purging: diff --git a/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja index 8f4767295..7d64930ef 100644 --- a/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja @@ -491,7 +491,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -514,5 +515,6 @@ trace: # # url_path: /v1/traces # # compression: false # # insecure: true -# # timeout: 10s +# # # timeout is in seconds +# # timeout: 10 {% endif %} diff --git a/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja index d3722b9f1..662e6a6c5 100644 --- a/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja @@ -505,7 +505,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -528,7 +529,8 @@ trace: # # url_path: /v1/traces # # compression: false # # insecure: true -# # timeout: 10s +# # # timeout is in seconds +# # timeout: 10 {% endif %} # enable purge _upload directories diff --git a/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja index f409ffa9f..3788ad26c 100644 --- a/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja @@ -505,7 +505,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -528,7 +529,8 @@ trace: # # url_path: /v1/traces # # compression: false # # insecure: true -# # timeout: 10s +# # # timeout is in seconds +# # timeout: 10 {% endif %} # enable purge _upload directories diff --git a/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja index 782ec7927..677c29a72 100644 --- a/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja @@ -512,7 +512,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -535,7 +536,8 @@ trace: # # url_path: /v1/traces # # compression: false # # insecure: true -# # timeout: 10s +# # # timeout is in seconds +# # timeout: 10 {% endif %} # enable purge _upload directories diff --git a/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja index d87218dfc..be93c4786 100644 --- a/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja @@ -530,7 +530,8 @@ trace: # url_path: /v1/traces # compression: false # insecure: true - # timeout: 10s + # # timeout is in seconds + # timeout: 10 {% endif%} {% else %} # trace: @@ -553,7 +554,8 @@ trace: # # url_path: /v1/traces # # compression: false # # insecure: true -# # timeout: 10s +# # # timeout is in seconds +# # timeout: 10 {% endif %} # enable purge _upload directories diff --git a/make/photon/prepare/models.py b/make/photon/prepare/models.py index ab45c1aca..8ce613bfa 100644 --- a/make/photon/prepare/models.py +++ b/make/photon/prepare/models.py @@ -172,7 +172,7 @@ class OtelExporter: self.url_path = config.get('url_path') self.compression = config.get('compression') or False self.insecure = config.get('insecure') or False - self.timeout = config.get('timeout') or '10s' + self.timeout = config.get('timeout') or '10' def validate(self): if not self.endpoint: