diff --git a/sql/n9e_mon.sql b/sql/n9e_mon.sql index b38534c8..7e5eedc1 100644 --- a/sql/n9e_mon.sql +++ b/sql/n9e_mon.sql @@ -324,21 +324,20 @@ CREATE TABLE `collect_rule` ( `nid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'nid', `step` int(11) NOT NULL DEFAULT '0' COMMENT 'step', `timeout` int(11) NOT NULL DEFAULT '0' COMMENT 'total timeout', - `collect_type` varchar(64) NOT NULL DEFAULT '' COMMENT 'collector name', - `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'name', + `collect_type` varchar(64) NOT NULL DEFAULT '' COMMENT 'collect plugin name', + `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'collect rule name', `region` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'region', `comment` varchar(512) NOT NULL DEFAULT '' COMMENT 'comment', `data` blob NULL COMMENT 'data', `tags` varchar(512) NOT NULL DEFAULT '' COMMENT 'tags', `creator` varchar(64) NOT NULL DEFAULT '' COMMENT 'creator', `updater` varchar(64) NOT NULL DEFAULT '' COMMENT 'updater', - `created` datetime NOT NULL COMMENT 'created', `created_at` bigint not null default 0, `updated_at` bigint not null default 0, PRIMARY KEY (`id`), KEY `idx_nid` (`nid`), KEY `idx_collect_type` (`collect_type`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'api collect'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'collect rule'; CREATE TABLE `aggr_calc` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', diff --git a/src/models/mon_collect_rule.go b/src/models/mon_collect_rule.go index 0cf34719..e7240cf5 100644 --- a/src/models/mon_collect_rule.go +++ b/src/models/mon_collect_rule.go @@ -96,7 +96,7 @@ func GetCollectRules(typ string, nid int64, limit, offset int) (total int64, lis return } - err = search().Desc("created").Limit(limit, offset).Find(&list) + err = search().Desc("updated_at").Limit(limit, offset).Find(&list) return }