Skip to content
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.

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

cp v6.3 prometheus changes #4389

Merged
merged 2 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 4 deletions server/controller/db/mysql/migration/rawsql/init.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2602,17 +2602,16 @@ TRUNCATE TABLE prometheus_label_name;

CREATE TABLE IF NOT EXISTS prometheus_label_value (
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
`value` VARCHAR(256) NOT NULL UNIQUE,
`value` TEXT,
`created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=innodb AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
TRUNCATE TABLE prometheus_label_value;

CREATE TABLE IF NOT EXISTS prometheus_label (
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
`name` VARCHAR(256) NOT NULL,
`value` VARCHAR(256) NOT NULL,
`created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
UNIQUE INDEX label(name, value)
`value` TEXT,
`created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
)ENGINE=innodb AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
TRUNCATE TABLE prometheus_label;

Expand Down
6 changes: 6 additions & 0 deletions server/controller/db/mysql/migration/rawsql/issu/6.3.1.54.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ALTER TABLE prometheus_label_value DROP INDEX value;
ALTER TABLE prometheus_label_value MODIFY COLUMN value TEXT;
ALTER TABLE prometheus_label DROP INDEX label;
ALTER TABLE prometheus_label MODIFY COLUMN value TEXT;

UPDATE db_version SET version='6.3.1.54';
2 changes: 1 addition & 1 deletion server/controller/db/mysql/migration/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ package migration

const (
DB_VERSION_TABLE = "db_version"
DB_VERSION_EXPECTED = "6.3.1.53"
DB_VERSION_EXPECTED = "6.3.1.54"
)
14 changes: 7 additions & 7 deletions server/controller/db/mysql/prometheus_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,29 @@ type PrometheusLabelName struct {

type PrometheusLabelValue struct {
IDField `gorm:"embedded"`
Value string `gorm:"column:value;type:varchar(256);unique;not null"`
Value string `gorm:"column:value;type:text;unique;default:''"`
}

type PrometheusLabel struct {
IDField `gorm:"embedded"`
Name string `gorm:"column:name;type:varchar(256);not null"`
Value string `gorm:"column:value;type:varchar(256);not null"`
ID int `gorm:"primaryKey;autoIncrement;unique;column:id;type:int;not null"`
Name string `gorm:"column:name;type:varchar(256);not null"`
Value string `gorm:"column:value;type:text;default:''"`
}

type PrometheusMetricLabel struct {
IDField `gorm:"embedded"`
ID int `gorm:"primaryKey;autoIncrement;unique;column:id;type:int;not null"`
MetricName string `gorm:"column:metric_name;type:varchar(256);not null"`
LabelID int `gorm:"column:label_id;type:int(10);not null"`
}

type PrometheusMetricTarget struct {
IDField `gorm:"embedded"`
ID int `gorm:"primaryKey;autoIncrement;unique;column:id;type:int;not null"`
MetricName string `gorm:"column:metric_name;type:varchar(256);not null"`
TargetID int `gorm:"column:target_id;type:int(10);not null"`
}

type PrometheusMetricAPPLabelLayout struct {
IDField `gorm:"embedded"`
ID int `gorm:"primaryKey;autoIncrement;unique;column:id;type:int;not null"`
MetricName string `gorm:"column:metric_name;type:varchar(256);not null"`
APPLabelName string `gorm:"column:app_label_name;type:varchar(256);not null"`
APPLabelColumnIndex uint8 `gorm:"column:app_label_column_index;type:tinyint(3) unsigned;not null"`
Expand Down
6 changes: 5 additions & 1 deletion server/controller/prometheus/cache/metric_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ func (k *metricNameToTargetIDs) Load(id string) (mapset.Set[int], bool) {
func (k *metricNameToTargetIDs) Get() map[string]mapset.Set[int] {
k.lock.Lock()
defer k.lock.Unlock()
return k.data
data := make(map[string]mapset.Set[int])
for k, v := range k.data {
data[k] = v
}
return data
}

func (k *metricNameToTargetIDs) Append(name string, id int) {
Expand Down
12 changes: 10 additions & 2 deletions server/controller/prometheus/cache/target.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ func (k *keyToTargetID) Load(tk TargetKey) (int, bool) {
func (k *keyToTargetID) Get() map[TargetKey]int {
k.lock.Lock()
defer k.lock.Unlock()
return k.data
data := make(map[TargetKey]int)
for k, v := range k.data {
data[k] = v
}
return data
}

func (k *keyToTargetID) Store(tk TargetKey, v int) {
Expand Down Expand Up @@ -103,7 +107,11 @@ func (t *targetIDToLabelNames) Contains(id int, labelName string) bool {
func (t *targetIDToLabelNames) Get() map[int]mapset.Set[string] {
t.lock.Lock()
defer t.lock.Unlock()
return t.data
data := make(map[int]mapset.Set[string])
for k, v := range t.data {
data[k] = v
}
return data
}

func (t *targetIDToLabelNames) Coverage(data map[int]mapset.Set[string]) {
Expand Down
Loading