diff --git a/packages/sql_input/_dev/test/system/test-mssql-config.yml b/packages/sql_input/_dev/test/system/test-mssql-config.yml index 704e552fd95..5be4eb07229 100644 --- a/packages/sql_input/_dev/test/system/test-mssql-config.yml +++ b/packages/sql_input/_dev/test/system/test-mssql-config.yml @@ -3,4 +3,4 @@ vars: hosts: - sqlserver://SA:1234_asdf@{{Hostname}} driver: "mssql" - sql_queries: "- query: SELECT counter_name, instance_name, cntr_value FROM sys.dm_os_performance_counters\n response_format: table\n- query: go\n response_format: table" + sql_queries: "- query: SELECT counter_name, instance_name, CAST(cntr_value AS VARCHAR(20)) AS cntr_value FROM sys.dm_os_performance_counters\n response_format: table\n- query: go\n response_format: table" diff --git a/packages/sql_input/_dev/test/system/test-postgresql-config.yml b/packages/sql_input/_dev/test/system/test-postgresql-config.yml index 4123ea833b8..d008d34ebf9 100644 --- a/packages/sql_input/_dev/test/system/test-postgresql-config.yml +++ b/packages/sql_input/_dev/test/system/test-postgresql-config.yml @@ -3,4 +3,4 @@ vars: hosts: - postgres://postgres:mysecretpassword@{{Hostname}}:{{Port}}/postgres?sslmode=disable driver: "postgres" - sql_queries: "- query: SELECT * FROM pg_stat_database;\n response_format: table\n \n" + sql_queries: "- query: SELECT CAST(blks_read AS VARCHAR), CAST(blks_hit AS VARCHAR), CAST(tup_returned AS VARCHAR), CAST(tup_fetched AS VARCHAR), CAST(tup_inserted AS VARCHAR), CAST(tup_updated AS VARCHAR), CAST(tup_deleted AS VARCHAR) FROM pg_stat_database;\n response_format: table\n \n" diff --git a/packages/sql_input/changelog.yml b/packages/sql_input/changelog.yml index 0f53a6f742f..a4de8ecf3d6 100644 --- a/packages/sql_input/changelog.yml +++ b/packages/sql_input/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.8.0" + changes: + - description: Manifest version update to 3.* + type: enhancement + link: https://github.com/elastic/integrations/pull/14266 - version: "0.7.0" changes: - description: Make hosts field secret diff --git a/packages/sql_input/fields/input.yml b/packages/sql_input/fields/input.yml index 117d93d817e..9cb736a4edc 100644 --- a/packages/sql_input/fields/input.yml +++ b/packages/sql_input/fields/input.yml @@ -22,4 +22,4 @@ description: Boolean values collected. - name: metrics.* description: Default mapping for metric fields. You need to add your own custom mappings when storing other kinds of information. - type: object + type: keyword diff --git a/packages/sql_input/manifest.yml b/packages/sql_input/manifest.yml index d2b221aec04..b8b0e23bef1 100644 --- a/packages/sql_input/manifest.yml +++ b/packages/sql_input/manifest.yml @@ -1,7 +1,7 @@ -format_version: 2.9.0 +format_version: 3.3.2 name: sql title: "SQL Input" -version: "0.7.0" +version: "0.8.0" description: "Collects Metrics by querying SQL Databases" type: input categories: @@ -77,3 +77,4 @@ policy_templates: Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the events are shipped. See [Processors](https://www.elastic.co/guide/en/fleet/current/elastic-agent-processor-configuration.html) for details. owner: github: elastic/obs-infraobs-integrations + type: elastic diff --git a/packages/sql_input/sample_event.json b/packages/sql_input/sample_event.json index b5f8d2e5f6a..959ae47a47f 100644 --- a/packages/sql_input/sample_event.json +++ b/packages/sql_input/sample_event.json @@ -60,31 +60,8 @@ "sql": { "driver": "postgres", "metrics": { - "active_time": 0, - "blk_read_time": 0, - "blk_write_time": 0, - "blks_hit": 453, - "blks_read": 87, - "conflicts": 0, - "datid": 0, - "deadlocks": 0, - "idle_in_transaction_time": 0, - "numbackends": 0, - "session_time": 0, - "sessions": 0, - "sessions_abandoned": 0, - "sessions_fatal": 0, - "sessions_killed": 0, - "temp_bytes": 0, - "temp_files": 0, - "tup_deleted": 0, - "tup_fetched": 50, - "tup_inserted": 24, - "tup_returned": 127, - "tup_updated": 5, - "xact_commit": 4, - "xact_rollback": 0 + "current_time": "2024-06-19T06:12:37.604443Z" }, - "query": "SELECT * FROM pg_stat_database;" + "query": "SELECT NOW() AS current_time" } } \ No newline at end of file