Skip to content

Commit

Permalink
Merge pull request #1 from jgbernalp/ibakshay-pr-21
Browse files Browse the repository at this point in the history 
update perses API dependency to fix duration types
  • Loading branch information
@ibakshay
ibakshay authored Nov 26, 2024
2 parents a5c8380 + 273fba2 commit 728b4be
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 3 deletions.
17 changes: 17 additions & 0 deletions config/crd/bases/perses.dev_perses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ spec:
read_timeout:
description: I/O read timeout
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
reject_read_only:
description: Reject read-only connections
Expand All @@ -139,6 +140,7 @@ spec:
timeout:
description: Dial timeout
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
tls_config:
description: TLS configuration
Expand Down Expand Up @@ -198,6 +200,7 @@ spec:
write_timeout:
description: I/O write timeout
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
required:
- allow_all_files
Expand Down Expand Up @@ -229,6 +232,7 @@ spec:
description: The interval at which to trigger the cleanup
of ephemeral dashboards, based on their TTLs.
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
enable:
description: When true user will be able to use the ephemeral
Expand All @@ -244,6 +248,7 @@ spec:
DEPRECATED.
Please use the config EphemeralDashboard instead.
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
frontend:
description: Frontend contains any config that will be used by
Expand Down Expand Up @@ -291,6 +296,10 @@ spec:
disable_custom:
type: boolean
options:
items:
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
type: array
required:
- disable_custom
Expand Down Expand Up @@ -503,6 +512,7 @@ spec:
refresh_interval:
description: Refresh interval to re-query the endpoint.
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
required:
- discovery_name
Expand All @@ -519,6 +529,7 @@ spec:
interval:
description: Interval is the refresh frequency
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
type: object
schemas:
Expand All @@ -529,6 +540,7 @@ spec:
type: string
interval:
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
panels_path:
type: string
Expand All @@ -550,6 +562,7 @@ spec:
description: AccessTokenTTL is the time to live of the
access token. By default, it is 15 minutes.
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
disable_sign_up:
description: |-
Expand Down Expand Up @@ -621,6 +634,7 @@ spec:
properties:
timeout:
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
tls_config:
properties:
Expand Down Expand Up @@ -745,6 +759,7 @@ spec:
properties:
timeout:
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
tls_config:
properties:
Expand Down Expand Up @@ -821,6 +836,7 @@ spec:
The refresh token is used to get a new access token when it is expired.
By default, it is 24 hours.
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
required:
- disable_sign_up
Expand All @@ -835,6 +851,7 @@ spec:
the RBAC cache needs to be refreshed with db content.
Only for SQL database setup.
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
guest_permissions:
description: Default permissions for guest users (logged-in
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/perses.dev_persesdashboards.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ spec:
description: Duration is the default time range to use when getting
data to fill the dashboard
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
layouts:
items:
Expand Down Expand Up @@ -174,6 +175,7 @@ spec:
description: RefreshInterval is the default refresh interval to use
when landing on the dashboard
format: duration
pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
variables:
items:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/perses/perses v0.49.1-0.20241125160011-3d34cf1b8849
github.com/perses/perses v0.49.1-0.20241126140800-e31e2915b6f2
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.10.0
gopkg.in/yaml.v2 v2.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
github.com/perses/common v0.26.0 h1:szF3GFTUgsCts3VYU3QY9OfgnYerjzHl9bo9pk4ZGyM=
github.com/perses/common v0.26.0/go.mod h1:5vlqNPN6i73VJprx7XA7EulzcbKmnV63jrqnyT27B+E=
github.com/perses/perses v0.49.1-0.20241125160011-3d34cf1b8849 h1:UOLUBlKlYpxxAGZWFmh5NYnA+/Zv8+1kfK+40a7Avxo=
github.com/perses/perses v0.49.1-0.20241125160011-3d34cf1b8849/go.mod h1:tElar8bunq4nRxZXw2hOcjSNwY0cOjMBFWt4tfjE4U0=
github.com/perses/perses v0.49.1-0.20241126140800-e31e2915b6f2 h1:F/6Oo+09Y27pb3/6eMuklrNHUSZxVJx9fs17hBlMhC0=
github.com/perses/perses v0.49.1-0.20241126140800-e31e2915b6f2/go.mod h1:tElar8bunq4nRxZXw2hOcjSNwY0cOjMBFWt4tfjE4U0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down

0 comments on commit 728b4be

Please sign in to comment.