diff --git a/Dockerfile b/Dockerfile index 06cd61d..06f56df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ MAINTAINER Loafle ENV APP_FILENAME="com.loafle.overflow.overflow_server-1.0.0-SNAPSHOT.jar" \ APP_HOME_PATH="/service" \ APP_MAIN_CLASS="com.loafle.overflow.OFMain" \ + APP_CONF_PATH="/opt/conf" \ PATH="$PATH:/opt/bin" ADD docker/bin/*.sh /opt/bin/ @@ -21,7 +22,7 @@ RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION && chmod +x /bin/tini \ && echo "$TINI_SHA /bin/tini" | sha256sum -c - - +VOLUME ${APP_CONF_PATH} EXPOSE 50006 ENTRYPOINT ["/bin/tini", "--"] diff --git a/docker-compose.yml b/docker-compose.yml index e1bbcb1..e2d0d54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,9 @@ services: restart: always image: docker.loafle.net/overflow/overflow_server:1.0.0-SNAPSHOT container_name: overFlow-server + volumes: +# - /service/overflow_server/data/opt/conf:/opt/conf + - /home/crusader/Temp/docker/conf:/opt/conf ports: - "50006:50006" diff --git a/docker/bin/docker-entrypoint.sh b/docker/bin/docker-entrypoint.sh index 8bceabd..44af60c 100644 --- a/docker/bin/docker-entrypoint.sh +++ b/docker/bin/docker-entrypoint.sh @@ -4,6 +4,6 @@ set -e cd /service -/usr/bin/java -cp ${APP_FILENAME}:lib/* ${APP_MAIN_CLASS} 50006 +/usr/bin/java -classpath ${APP_CONF_PATH}/:${APP_FILENAME}:lib/* ${APP_MAIN_CLASS} 50006 exec "$@" \ No newline at end of file diff --git a/src/main/resources/database.properties b/docker/conf/database.properties similarity index 92% rename from src/main/resources/database.properties rename to docker/conf/database.properties index e8c1188..0bc0a7d 100644 --- a/src/main/resources/database.properties +++ b/docker/conf/database.properties @@ -5,7 +5,7 @@ datasource.driver-class-name=org.postgresql.Driver jpa.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect jpa.database=postgresql -jpa.hibernate.ddl-auto=create +jpa.hibernate.ddl-auto=none #jpa.hibernate.ddl-auto=update jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy jpa.show-sql=true diff --git a/docker/conf/logback.xml b/docker/conf/logback.xml new file mode 100644 index 0000000..15d2ff3 --- /dev/null +++ b/docker/conf/logback.xml @@ -0,0 +1,17 @@ + + + overflow_server + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{32} - %msg%n + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mail.properties b/docker/conf/mail.properties similarity index 100% rename from src/main/resources/mail.properties rename to docker/conf/mail.properties diff --git a/pom.xml b/pom.xml index e11d045..f3c8ce7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,7 @@ 1.4.7 1.9.13 - - ${docker.registry.name}phauer/${project.artifactId} + docker.loafle.net/overflow @@ -139,11 +138,10 @@ - - src/main/resources + src/main/resources/${environment} true @@ -258,20 +256,10 @@ com.loafle.overflow.OFMain - docker.loafle.net/overflow/${project.artifactId} + ${docker.registry.name}/${project.artifactId} ${project.version} - - - - - - - - - - @@ -289,4 +277,33 @@ + + + local + + true + + + local + + + + development + + development + + + + staging + + staging + + + + production + + production + + + \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/spring/JdbcConfiguration.java b/src/main/java/com/loafle/overflow/spring/JdbcConfiguration.java index b22498d..99773b7 100644 --- a/src/main/java/com/loafle/overflow/spring/JdbcConfiguration.java +++ b/src/main/java/com/loafle/overflow/spring/JdbcConfiguration.java @@ -82,13 +82,18 @@ public class JdbcConfiguration implements TransactionManagementConfigurer { @Bean public DataSourceInitializer dataSourceInitializer(DataSource dataSource) { - ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(); - databasePopulator.addScript(new ClassPathResource("/init.sql")); - databasePopulator.setIgnoreFailedDrops(true); - DataSourceInitializer initializer = new DataSourceInitializer(); initializer.setDataSource(dataSource); - initializer.setDatabasePopulator(databasePopulator); + + ClassPathResource initSqlResource = new ClassPathResource("/init.sql"); + if (initSqlResource.exists()) { + ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(); + databasePopulator.addScript(initSqlResource); + databasePopulator.setIgnoreFailedDrops(true); + initializer.setDatabasePopulator(databasePopulator); + } else { + initializer.setEnabled(false); + } return initializer; } diff --git a/src/main/resources/_ b/src/main/resources/_ deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/local/database.properties b/src/main/resources/local/database.properties new file mode 100644 index 0000000..6b6f9d1 --- /dev/null +++ b/src/main/resources/local/database.properties @@ -0,0 +1,11 @@ +datasource.url=jdbc:postgresql://127.0.0.1:5432/overflow +datasource.username=overflow +datasource.password=qwer5795 +datasource.driver-class-name=org.postgresql.Driver + +jpa.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +jpa.database=postgresql +jpa.hibernate.ddl-auto=create +#jpa.hibernate.ddl-auto=update +jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy +jpa.show-sql=true diff --git a/src/main/resources/init.sql b/src/main/resources/local/init.sql similarity index 79% rename from src/main/resources/init.sql rename to src/main/resources/local/init.sql index 5b64d95..5a23153 100644 --- a/src/main/resources/init.sql +++ b/src/main/resources/local/init.sql @@ -521,215 +521,218 @@ INSERT INTO meta_sensor_item (create_date,"key",name,type_id) VALUES ( INSERT INTO meta_sensor_item (create_date,"key",name,type_id) VALUES ( '2017-06-26 20:10','mem.usage.free.paging','FreeSpaceInPagingFiles','2'); INSERT INTO meta_sensor_item (create_date,"key",name,type_id) VALUES ( +'2017-06-26 20:10','disk.usage.caption[$0]','Caption','3'); +INSERT INTO meta_sensor_item (create_date,"key",name,type_id) VALUES ( '2017-06-26 20:10','disk.usage.total[$0]','Size','3'); INSERT INTO meta_sensor_item (create_date,"key",name,type_id) VALUES ( '2017-06-26 20:10','disk.usage.free[$0]','FreeSpace','3'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_dump_status','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','5'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_load_status','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','6'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_resize_status','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','7'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_pages_data','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','8'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_bytes_data','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','9'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_pages_dirty','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','10'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_bytes_dirty','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','11'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_pages_flushed','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','12'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_pages_free','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','13'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_pages_misc','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','14'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_pages_total','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','15'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_read_ahead_rnd','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','16'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_read_ahead','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','17'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_read_ahead_evicted','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','18'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_read_requests','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','19'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_reads','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','20'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_wait_free','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','21'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_buffer_pool_write_requests','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','22'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_fsyncs','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','23'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_pending_fsyncs','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','24'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_pending_reads','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','25'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_pending_writes','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','26'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_read','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','27'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_reads','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','28'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_writes','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','29'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_data_written','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','30'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_dblwr_pages_written','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','31'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_dblwr_writes','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','32'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_log_waits','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','33'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_log_write_requests','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','34'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_log_writes','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','35'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_os_log_fsyncs','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','36'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_os_log_pending_fsyncs','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','37'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_os_log_pending_writes','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','38'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_os_log_written','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','39'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_page_size','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','40'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_pages_created','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','41'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_pages_read','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','42'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_pages_written','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','43'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_row_lock_current_waits','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','44'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_row_lock_time','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','45'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_row_lock_time_avg','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','46'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_row_lock_time_max','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','47'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_row_lock_waits','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','48'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_rows_deleted','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','49'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_rows_inserted','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','50'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_rows_read','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','51'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_rows_updated','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','52'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_num_open_files','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','53'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_truncated_status_writes','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','54'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Innodb_available_undo_logs','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','55'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Connection_errors_accept','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','56'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Connection_errors_internal','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','57'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Connection_errors_max_connections','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','58'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Connection_errors_peer_address','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','59'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Connection_errors_select','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','60'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Connection_errors_tcpwrap','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','61'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Connections','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','62'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Max_used_connections','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','63'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Max_used_connections_time','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','64'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_accounts_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','65'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_cond_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','66'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_cond_instances_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','67'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_digest_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','68'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_file_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','69'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_file_handles_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','70'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_file_instances_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','71'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_hosts_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','72'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_index_stat_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','73'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_locker_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','74'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_memory_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','75'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_metadata_lock_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','76'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_mutex_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','77'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_mutex_instances_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','78'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_nested_statement_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','79'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_prepared_statements_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','80'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_program_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','81'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_rwlock_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','82'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_rwlock_instances_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','83'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_session_connect_attrs_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','84'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_socket_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','85'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_socket_instances_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','86'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_stage_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','87'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_statement_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','88'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_table_handles_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','89'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_table_instances_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','90'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_table_lock_stat_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','91'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_thread_classes_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','92'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_thread_instances_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','93'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Performance_schema_users_lost','show status','{"valueColumn": "Value","keyColumns": ["Variable_name"]}','11','94'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','PercentIdleTime','Win32_PerfFormattedData_PerfOS_Processor','{"where": "Name=''_Total''"}','23','95'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','PercentProcessorTime','Win32_PerfFormattedData_PerfOS_Processor','{"where": "Name=''_Total''"}','23','96'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','PercentUserTime','Win32_PerfFormattedData_PerfOS_Processor','{"where": "Name=''_Total''"}','23','97'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','PercentPrivilegedTime','Win32_PerfFormattedData_PerfOS_Processor','{"where": "Name=''_Total''"}','23','98'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','TotalVirtualMemorySize','Win32_OperatingSystem','','23','99'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','TotalVisibleMemorySize','Win32_OperatingSystem','','23','100'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','SizeStoredInPagingFiles','Win32_OperatingSystem','','23','101'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','FreeVirtualMemory','Win32_OperatingSystem','','23','102'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','FreePhysicalMemory','Win32_OperatingSystem','','23','103'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','FreeSpaceInPagingFiles','Win32_OperatingSystem ','','23','104'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','Size','Win32_LogicalDisk','{"arrayColumns": ["Caption"],"appends": ["Caption"]}','23','105'); -INSERT INTO meta_sensor_item_key (create_date,"key",froms,option_json,crawler_id,item_id) VALUES ( -'2017-06-26 19:49','FreeSpace','Win32_LogicalDisk','{"arrayColumns": ["Caption"],"appends": ["Caption"]}','23','106'); - +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_dump_status','show status','11','5'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_load_status','show status','11','6'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_resize_status','show status','11','7'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_pages_data','show status','11','8'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_bytes_data','show status','11','9'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_pages_dirty','show status','11','10'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_bytes_dirty','show status','11','11'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_pages_flushed','show status','11','12'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_pages_free','show status','11','13'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_pages_misc','show status','11','14'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_pages_total','show status','11','15'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_read_ahead_rnd','show status','11','16'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_read_ahead','show status','11','17'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_read_ahead_evicted','show status','11','18'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_read_requests','show status','11','19'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_reads','show status','11','20'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_wait_free','show status','11','21'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_buffer_pool_write_requests','show status','11','22'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_fsyncs','show status','11','23'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_pending_fsyncs','show status','11','24'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_pending_reads','show status','11','25'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_pending_writes','show status','11','26'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_read','show status','11','27'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_reads','show status','11','28'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_writes','show status','11','29'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_data_written','show status','11','30'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_dblwr_pages_written','show status','11','31'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_dblwr_writes','show status','11','32'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_log_waits','show status','11','33'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_log_write_requests','show status','11','34'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_log_writes','show status','11','35'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_os_log_fsyncs','show status','11','36'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_os_log_pending_fsyncs','show status','11','37'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_os_log_pending_writes','show status','11','38'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_os_log_written','show status','11','39'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_page_size','show status','11','40'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_pages_created','show status','11','41'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_pages_read','show status','11','42'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_pages_written','show status','11','43'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_row_lock_current_waits','show status','11','44'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_row_lock_time','show status','11','45'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_row_lock_time_avg','show status','11','46'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_row_lock_time_max','show status','11','47'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_row_lock_waits','show status','11','48'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_rows_deleted','show status','11','49'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_rows_inserted','show status','11','50'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_rows_read','show status','11','51'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_rows_updated','show status','11','52'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_num_open_files','show status','11','53'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_truncated_status_writes','show status','11','54'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Innodb_available_undo_logs','show status','11','55'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Connection_errors_accept','show status','11','56'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Connection_errors_internal','show status','11','57'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Connection_errors_max_connections','show status','11','58'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Connection_errors_peer_address','show status','11','59'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Connection_errors_select','show status','11','60'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Connection_errors_tcpwrap','show status','11','61'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Connections','show status','11','62'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Max_used_connections','show status','11','63'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Max_used_connections_time','show status','11','64'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_accounts_lost','show status','11','65'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_cond_classes_lost','show status','11','66'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_cond_instances_lost','show status','11','67'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_digest_lost','show status','11','68'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_file_classes_lost','show status','11','69'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_file_handles_lost','show status','11','70'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_file_instances_lost','show status','11','71'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_hosts_lost','show status','11','72'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_index_stat_lost','show status','11','73'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_locker_lost','show status','11','74'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_memory_classes_lost','show status','11','75'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_metadata_lock_lost','show status','11','76'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_mutex_classes_lost','show status','11','77'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_mutex_instances_lost','show status','11','78'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_nested_statement_lost','show status','11','79'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_prepared_statements_lost','show status','11','80'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_program_lost','show status','11','81'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_rwlock_classes_lost','show status','11','82'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_rwlock_instances_lost','show status','11','83'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_session_connect_attrs_lost','show status','11','84'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_socket_classes_lost','show status','11','85'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_socket_instances_lost','show status','11','86'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_stage_classes_lost','show status','11','87'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_statement_classes_lost','show status','11','88'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_table_handles_lost','show status','11','89'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_table_instances_lost','show status','11','90'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_table_lock_stat_lost','show status','11','91'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_thread_classes_lost','show status','11','92'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_thread_instances_lost','show status','11','93'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Performance_schema_users_lost','show status','11','94'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','PercentIdleTime','Win32_PerfFormattedData_PerfOS_Processor where Name=''_Total''','23','95'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','PercentProcessorTime','Win32_PerfFormattedData_PerfOS_Processor where Name=''_Total''','23','96'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','PercentUserTime','Win32_PerfFormattedData_PerfOS_Processor where Name=''_Total''','23','97'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','PercentPrivilegedTime','Win32_PerfFormattedData_PerfOS_Processor where Name=''_Total''','23','98'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','TotalVirtualMemorySize','Win32_OperatingSystem','23','99'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','TotalVisibleMemorySize','Win32_OperatingSystem','23','100'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','SizeStoredInPagingFiles','Win32_OperatingSystem','23','101'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','FreeVirtualMemory','Win32_OperatingSystem','23','102'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','FreePhysicalMemory','Win32_OperatingSystem','23','103'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','FreeSpaceInPagingFiles','Win32_OperatingSystem ','23','104'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Caption','Win32_LogicalDisk','23','105'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','Size','Win32_LogicalDisk','23','106'); +INSERT INTO meta_sensor_item_key (create_date,"key","froms",crawler_id,item_id) VALUES ( +'2017-06-26 19:49','FreeSpace','Win32_LogicalDisk','23','107'); INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES ( 1,'2017-07-27 15:29:48.634',23,26); @@ -816,7 +819,7 @@ INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,stat 'loafle','2017-06-26 11:07:27.625','overflow@loafle.com','overFlow','000-000-0000','$2a$10$G2bbjoX9.fOnxJx/8DZqPujFYrEQtIEB.f98/8K20XiGWEhwPakZ.',2); INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,status_id) VALUES ( -'loafle','2017-06-26 11:07:27.625','geek@loafle.com','geek','000-000-0000','$2a$10$G2bbjoX9.fOnxJx/8DZqPujFYrEQtIEB.f98/8K20XiGWEhwPakZ.',1); +'loafle','2017-06-26 11:07:27.625','geekdev@naver.com','geek','000-000-0000','$2a$10$G2bbjoX9.fOnxJx/8DZqPujFYrEQtIEB.f98/8K20XiGWEhwPakZ.',1); INSERT INTO public.email_auth (auth_confirm_date,create_date,email_auth_key,member_id) VALUES ( NULL,'2017-06-26 15:28:48.895','dbseogns1234',1); @@ -890,8 +893,6 @@ INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_i NULL,'2017-06-26 20:19:07.074','My sensor 22222',1,2,1); INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id) VALUES ( NULL,'2017-08-28 16:17:05.506','OS_SERVICE-MYSQL_CRAWLER',11,1,4); -INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id) VALUES ( -NULL,'2017-09-05 12:26:02.738','HOST-WMI_CRAWLER',23,1,3); INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( '2017-06-26 20:21:16.626',1,1); @@ -1078,30 +1079,6 @@ INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( '2017-08-28 16:17:05.506',93,3); INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( '2017-08-28 16:17:05.506',94,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',95,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',96,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',97,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',98,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',99,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',100,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',101,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',102,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',103,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',104,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',105,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',106,4); INSERT INTO public.noauth_probe (api_key,create_date,host_name,ip_address,mac_address,temp_probe_key,domain_id,probe_id,status) VALUES ( '52abd6fd57e511e7ac52080027658d13','2017-06-26 12:43:46.877','snoop',3232235980,8796753988883,'1cf2555c57d511e79714080027658d13',1,NULL,3); @@ -1320,6 +1297,7 @@ INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id, INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES ( 100,'2017-08-24 18:33:27.217','Test History 99',1,1,1,3); + INSERT INTO public.notification (id,confirm_date,create_date,message,title,member_id) VALUES ( 1,'2017-08-29 16:39:16.198','2017-08-29 16:39:17.756','Message0','Title0',1); INSERT INTO public.notification (id,confirm_date,create_date,message,title,member_id) VALUES ( diff --git a/src/main/resources/local/mail.properties b/src/main/resources/local/mail.properties new file mode 100644 index 0000000..99f696d --- /dev/null +++ b/src/main/resources/local/mail.properties @@ -0,0 +1,14 @@ +# Naver SMTP +mail.host=smtp.worksmobile.com +mail.port=465 +mail.username=geek@loafle.com +mail.password=@loafle@5795 +mail.protocol=smtps + +mail.properties.mail.smtp.auth=true +mail.transport.protocol=smtp +mail.properties.mail.smtp.starttls.enable=true +mail.smtps.ssl.checkserveridentity=true +mail.smtps.ssl.trust=* + + diff --git a/src/test/java/com/loafle/overflow/proxy/ServiceInvokerTest.java b/src/test/java/com/loafle/overflow/proxy/ServiceInvokerTest.java index 3872f80..0c1ea57 100644 --- a/src/test/java/com/loafle/overflow/proxy/ServiceInvokerTest.java +++ b/src/test/java/com/loafle/overflow/proxy/ServiceInvokerTest.java @@ -41,21 +41,21 @@ public class ServiceInvokerTest { // // serviceInvoker.invoke("TargetDiscoveryService", "saveAllTarget", params); - List params2 = new ArrayList<>(1); - params2.add(ByteString.copyFromUtf8("1")); - - serviceInvoker.invoke("InfraOSService", "read", params2); - - List params3 = new ArrayList<>(1); - params3.add(ByteString.copyFromUtf8("1")); - - serviceInvoker.invoke("MemberService", "read", params3); - - List params4 = new ArrayList<>(2); - params4.add(ByteString.copyFromUtf8("ddddddfsafsd")); - params4.add(ByteString.copyFromUtf8("243234234234")); - - serviceInvoker.invoke("MemberService", "signin", params4); +// List params2 = new ArrayList<>(1); +// params2.add(ByteString.copyFromUtf8("1")); +// +// serviceInvoker.invoke("InfraOSService", "read", params2); +// +// List params3 = new ArrayList<>(1); +// params3.add(ByteString.copyFromUtf8("1")); +// +// serviceInvoker.invoke("MemberService", "read", params3); +// +// List params4 = new ArrayList<>(2); +// params4.add(ByteString.copyFromUtf8("ddddddfsafsd")); +// params4.add(ByteString.copyFromUtf8("243234234234")); +// +// serviceInvoker.invoke("MemberService", "signin", params4); } diff --git a/src/test/resources/database.properties b/src/test/resources/database.properties index 0b6c454..6b6f9d1 100644 --- a/src/test/resources/database.properties +++ b/src/test/resources/database.properties @@ -1,4 +1,4 @@ -datasource.url=jdbc:postgresql://192.168.1.209:5432/overflow +datasource.url=jdbc:postgresql://127.0.0.1:5432/overflow datasource.username=overflow datasource.password=qwer5795 datasource.driver-class-name=org.postgresql.Driver