Skip to content

Commit ee49b46

Browse files
kekkkerkekkker
committed
Convert millis to seconds
1 parent b4149e1 commit ee49b46

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎collector/cluster_license.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,22 @@ var (
5454
var (
5555
licenseMaxNodes = prometheus.NewDesc(
5656
prometheus.BuildFQName(namespace, "cluster_license", "max_nodes"),
57-
"The max amount of nodes allowed by the license",
57+
"The max amount of nodes allowed by the license.",
5858
defaultClusterLicenseLabels, nil,
5959
)
6060
licenseIssueDate = prometheus.NewDesc(
61-
prometheus.BuildFQName(namespace, "cluster_license", "issue_date_in_millis"),
62-
"License issue date in milliseconds",
61+
prometheus.BuildFQName(namespace, "cluster_license", "issue_date_seconds"),
62+
"License issue date since unix epoch in seconds.",
6363
defaultClusterLicenseLabels, nil,
6464
)
6565
licenseExpiryDate = prometheus.NewDesc(
66-
prometheus.BuildFQName(namespace, "cluster_license", "expiry_date_in_millis"),
67-
"License expiry date in milliseconds",
66+
prometheus.BuildFQName(namespace, "cluster_license", "expiry_date_seconds"),
67+
"License expiry date since unix epoch in seconds.",
6868
defaultClusterLicenseLabels, nil,
6969
)
7070
licenseStartDate = prometheus.NewDesc(
71-
prometheus.BuildFQName(namespace, "cluster_license", "start_date_in_millis"),
72-
"License start date in milliseconds",
71+
prometheus.BuildFQName(namespace, "cluster_license", "start_date_seconds"),
72+
"License start date since unix epoch in seconds.",
7373
defaultClusterLicenseLabels, nil,
7474
)
7575
)
@@ -137,21 +137,21 @@ func (c *ClusterLicense) Update(ctx context.Context, ch chan<- prometheus.Metric
137137
ch <- prometheus.MustNewConstMetric(
138138
licenseIssueDate,
139139
prometheus.GaugeValue,
140-
float64(clr.License.IssueDateInMillis),
140+
float64(clr.License.IssueDateInMillis/1000),
141141
defaultClusterLicenseLabelsValues(clr)...,
142142
)
143143

144144
ch <- prometheus.MustNewConstMetric(
145145
licenseExpiryDate,
146146
prometheus.GaugeValue,
147-
float64(clr.License.ExpiryDateInMillis),
147+
float64(clr.License.ExpiryDateInMillis/1000),
148148
defaultClusterLicenseLabelsValues(clr)...,
149149
)
150150

151151
ch <- prometheus.MustNewConstMetric(
152152
licenseStartDate,
153153
prometheus.GaugeValue,
154-
float64(clr.License.StartDateInMillis),
154+
float64(clr.License.StartDateInMillis/1000),
155155
defaultClusterLicenseLabelsValues(clr)...,
156156
)
157157

‎collector/cluster_license_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -39,36 +39,36 @@ func TestClusterLicense(t *testing.T) {
3939
name: "basic",
4040
file: "../fixtures/clusterlicense/basic.json",
4141
want: `
42-
# HELP elasticsearch_cluster_license_expiry_date_in_millis License expiry date in milliseconds
43-
# TYPE elasticsearch_cluster_license_expiry_date_in_millis gauge
44-
elasticsearch_cluster_license_expiry_date_in_millis{issued_to="redacted",issuer="elasticsearch",status="active",type="basic"} 0
45-
# HELP elasticsearch_cluster_license_issue_date_in_millis License issue date in milliseconds
46-
# TYPE elasticsearch_cluster_license_issue_date_in_millis gauge
47-
elasticsearch_cluster_license_issue_date_in_millis{issued_to="redacted",issuer="elasticsearch",status="active",type="basic"} 1.702196247064e+12
48-
# HELP elasticsearch_cluster_license_max_nodes The max amount of nodes allowed by the license
42+
# HELP elasticsearch_cluster_license_expiry_date_seconds License expiry date since unix epoch in seconds.
43+
# TYPE elasticsearch_cluster_license_expiry_date_seconds gauge
44+
elasticsearch_cluster_license_expiry_date_seconds{issued_to="redacted",issuer="elasticsearch",status="active",type="basic"} 0
45+
# HELP elasticsearch_cluster_license_issue_date_seconds License issue date since unix epoch in seconds.
46+
# TYPE elasticsearch_cluster_license_issue_date_seconds gauge
47+
elasticsearch_cluster_license_issue_date_seconds{issued_to="redacted",issuer="elasticsearch",status="active",type="basic"} 1.702196247e+09
48+
# HELP elasticsearch_cluster_license_max_nodes The max amount of nodes allowed by the license.
4949
# TYPE elasticsearch_cluster_license_max_nodes gauge
5050
elasticsearch_cluster_license_max_nodes{issued_to="redacted",issuer="elasticsearch",status="active",type="basic"} 1000
51-
# HELP elasticsearch_cluster_license_start_date_in_millis License start date in milliseconds
52-
# TYPE elasticsearch_cluster_license_start_date_in_millis gauge
53-
elasticsearch_cluster_license_start_date_in_millis{issued_to="redacted",issuer="elasticsearch",status="active",type="basic"} -1
51+
# HELP elasticsearch_cluster_license_start_date_seconds License start date since unix epoch in seconds.
52+
# TYPE elasticsearch_cluster_license_start_date_seconds gauge
53+
elasticsearch_cluster_license_start_date_seconds{issued_to="redacted",issuer="elasticsearch",status="active",type="basic"} 0
5454
`,
5555
},
5656
{
5757
name: "platinum",
5858
file: "../fixtures/clusterlicense/platinum.json",
5959
want: `
60-
# HELP elasticsearch_cluster_license_expiry_date_in_millis License expiry date in milliseconds
61-
# TYPE elasticsearch_cluster_license_expiry_date_in_millis gauge
62-
elasticsearch_cluster_license_expiry_date_in_millis{issued_to="redacted",issuer="API",status="active",type="platinum"} 1.714521599999e+12
63-
# HELP elasticsearch_cluster_license_issue_date_in_millis License issue date in milliseconds
64-
# TYPE elasticsearch_cluster_license_issue_date_in_millis gauge
65-
elasticsearch_cluster_license_issue_date_in_millis{issued_to="redacted",issuer="API",status="active",type="platinum"} 1.6192224e+12
66-
# HELP elasticsearch_cluster_license_max_nodes The max amount of nodes allowed by the license
60+
# HELP elasticsearch_cluster_license_expiry_date_seconds License expiry date since unix epoch in seconds.
61+
# TYPE elasticsearch_cluster_license_expiry_date_seconds gauge
62+
elasticsearch_cluster_license_expiry_date_seconds{issued_to="redacted",issuer="API",status="active",type="platinum"} 1.714521599e+09
63+
# HELP elasticsearch_cluster_license_issue_date_seconds License issue date since unix epoch in seconds.
64+
# TYPE elasticsearch_cluster_license_issue_date_seconds gauge
65+
elasticsearch_cluster_license_issue_date_seconds{issued_to="redacted",issuer="API",status="active",type="platinum"} 1.6192224e+09
66+
# HELP elasticsearch_cluster_license_max_nodes The max amount of nodes allowed by the license.
6767
# TYPE elasticsearch_cluster_license_max_nodes gauge
6868
elasticsearch_cluster_license_max_nodes{issued_to="redacted",issuer="API",status="active",type="platinum"} 10
69-
# HELP elasticsearch_cluster_license_start_date_in_millis License start date in milliseconds
70-
# TYPE elasticsearch_cluster_license_start_date_in_millis gauge
71-
elasticsearch_cluster_license_start_date_in_millis{issued_to="redacted",issuer="API",status="active",type="platinum"} 1.6192224e+12
69+
# HELP elasticsearch_cluster_license_start_date_seconds License start date since unix epoch in seconds.
70+
# TYPE elasticsearch_cluster_license_start_date_seconds gauge
71+
elasticsearch_cluster_license_start_date_seconds{issued_to="redacted",issuer="API",status="active",type="platinum"} 1.6192224e+09
7272
`,
7373
},
7474
}

0 commit comments

Comments
 (0)