This commit is contained in:
insanity 2017-11-08 15:56:00 +09:00
parent 20af559831
commit c2496aa0aa
2 changed files with 61 additions and 50 deletions

View File

@ -19,6 +19,7 @@ public class MetaSensorDisplayItem {
private MetaSensorItemUnit unit; private MetaSensorItemUnit unit;
private Date createDate; private Date createDate;
private boolean isDefault; private boolean isDefault;
private MetaSensorItemType itemType;
public MetaSensorDisplayItem() { public MetaSensorDisplayItem() {
@ -104,4 +105,14 @@ public class MetaSensorDisplayItem {
public void setDefault(boolean aDefault) { public void setDefault(boolean aDefault) {
isDefault = aDefault; isDefault = aDefault;
} }
@ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false)
public MetaSensorItemType getItemType() {
return itemType;
}
public void setItemType(MetaSensorItemType itemType) {
this.itemType = itemType;
}
} }

View File

@ -926,56 +926,56 @@ INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler
'146','2017-06-26 19:49:04','Win32_OperatingSystem ','FreeSpaceInPagingFiles','','23','146','3'); '146','2017-06-26 19:49:04','Win32_OperatingSystem ','FreeSpaceInPagingFiles','','23','146','3');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'1','2017-11-07 16:08:59','true','','CPU Total usage (%)','ssh.cpu.usage.total','21','1'); '1','2017-11-07 16:08:59','true','','CPU Total usage (%)','ssh.cpu.usage.total','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'2','2017-11-07 16:08:59','false','','CPU User (%)','ssh.cpu.usage.user','21','1'); '2','2017-11-07 16:08:59','false','','CPU User (%)','ssh.cpu.usage.user','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'3','2017-11-07 16:08:59','false','','CPU Nice (%)','ssh.cpu.usage.nice','21','1'); '3','2017-11-07 16:08:59','false','','CPU Nice (%)','ssh.cpu.usage.nice','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'4','2017-11-07 16:08:59','false','','CPU System (%)','ssh.cpu.usage.system','21','1'); '4','2017-11-07 16:08:59','false','','CPU System (%)','ssh.cpu.usage.system','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'5','2017-11-07 16:08:59','false','','CPU Idle (%)','ssh.cpu.usage.idle','21','1'); '5','2017-11-07 16:08:59','false','','CPU Idle (%)','ssh.cpu.usage.idle','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'6','2017-11-07 16:08:59','false','','CPU IO wait (%)','ssh.cpu.usage.iowait','21','1'); '6','2017-11-07 16:08:59','false','','CPU IO wait (%)','ssh.cpu.usage.iowait','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'7','2017-11-07 16:08:59','false','','CPU IRQ (%)','ssh.cpu.usage.irq','21','1'); '7','2017-11-07 16:08:59','false','','CPU IRQ (%)','ssh.cpu.usage.irq','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'8','2017-11-07 16:08:59','false','','CPU Soft IRQ (%)','ssh.cpu.usage.softirq','21','1'); '8','2017-11-07 16:08:59','false','','CPU Soft IRQ (%)','ssh.cpu.usage.softirq','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'9','2017-11-07 16:08:59','false','','CPU Steal (%)','ssh.cpu.usage.steal','21','1'); '9','2017-11-07 16:08:59','false','','CPU Steal (%)','ssh.cpu.usage.steal','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'10','2017-11-07 16:08:59','false','','CPU Guest (%)','ssh.cpu.usage.guest','21','1'); '10','2017-11-07 16:08:59','false','','CPU Guest (%)','ssh.cpu.usage.guest','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'11','2017-11-07 16:08:59','false','','CPU Guest Nice (%)','ssh.cpu.usage.gnice','21','1'); '11','2017-11-07 16:08:59','false','','CPU Guest Nice (%)','ssh.cpu.usage.gnice','21','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'12','2017-11-07 16:08:59','true','','CPU Total usage (%)','wmi.cpu.usage.total','23','1'); '12','2017-11-07 16:08:59','true','','CPU Total usage (%)','wmi.cpu.usage.total','23','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'13','2017-11-07 16:08:59','false','','CPU Idle (%)','wmi.cpu.usage.idle','23','1'); '13','2017-11-07 16:08:59','false','','CPU Idle (%)','wmi.cpu.usage.idle','23','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'14','2017-11-07 16:08:59','false','','CPU Processor (%)','wmi.cpu.usage.processor','23','1'); '14','2017-11-07 16:08:59','false','','CPU Processor (%)','wmi.cpu.usage.processor','23','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'15','2017-11-07 16:08:59','false','','CPU User (%)','wmi.cpu.usage.user','23','1'); '15','2017-11-07 16:08:59','false','','CPU User (%)','wmi.cpu.usage.user','23','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'16','2017-11-07 16:08:59','false','','CPU Privilege (%)','wmi.cpu.usage.privilege','23','1'); '16','2017-11-07 16:08:59','false','','CPU Privilege (%)','wmi.cpu.usage.privilege','23','1','1');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'17','2017-11-07 16:08:59','true','','Memory Total Usage (%)','ssh.mem.usage.total','21','1'); '17','2017-11-07 16:08:59','true','','Memory Total Usage (%)','ssh.mem.usage.total','21','1','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'18','2017-11-07 16:08:59','false','','Memory Free space (mb)','ssh.mem.usage.free','21','4'); '18','2017-11-07 16:08:59','false','','Memory Free space (mb)','ssh.mem.usage.free','21','4','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'19','2017-11-07 16:08:59','false','','Buffered Memory (mb)','ssh.mem.usage.buffers','21','4'); '19','2017-11-07 16:08:59','false','','Buffered Memory (mb)','ssh.mem.usage.buffers','21','4','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'20','2017-11-07 16:08:59','false','','Cached Memory (mb)','ssh.mem.usage.cached','21','4'); '20','2017-11-07 16:08:59','false','','Cached Memory (mb)','ssh.mem.usage.cached','21','4','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'21','2017-11-07 16:08:59','true','','Swap Total Usage (%)','ssh.mem.swap.usage.total','21','1'); '21','2017-11-07 16:08:59','true','','Swap Total Usage (%)','ssh.mem.swap.usage.total','21','1','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'22','2017-11-07 16:08:59','false','','Cached Swap (mb)','ssh.mem.swap.usage.cached','21','4'); '22','2017-11-07 16:08:59','false','','Cached Swap (mb)','ssh.mem.swap.usage.cached','21','4','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'23','2017-11-07 16:08:59','true','','Memory Total usage (%)','wmi.mem.usage.total','23','1'); '23','2017-11-07 16:08:59','true','','Memory Total usage (%)','wmi.mem.usage.total','23','1','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'24','2017-11-07 16:08:59','false','','Virtual Memory Usage (%)','wmi.mem.virtual.usage.total','23','1'); '24','2017-11-07 16:08:59','false','','Virtual Memory Usage (%)','wmi.mem.virtual.usage.total','23','1','2');
INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id) VALUES ( INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
'25','2017-11-07 16:08:59','false','','Paging Usage (%)','wmi.mem.paging.usage.total','23','1'); '25','2017-11-07 16:08:59','false','','Paging Usage (%)','wmi.mem.paging.usage.total','23','1','2');
INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES ( INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
'1','1','119'); '1','1','119');