diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c0ee812 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 0ab0933..916bbea 100644 --- a/README.md +++ b/README.md @@ -64,17 +64,11 @@ Storage (default : mysql root@localhost:3388) java -jar metrics-VERSION-all.jar -password=*** metrics-stats-storage - Table;Count;SizeKB; - "metricdata_hour";"3422";"7760"; - "metricdata_hour_agg";"3422";"7760"; - "metricdata_hour_agg_app";"3422";"7744"; - "metricdata_min";"0";"704"; - "metricdata_min_agg";"0";"176"; - "metricdata_min_agg_app";"0";"352"; - "metricdata_ten_min";"0";"1408"; - "metricdata_ten_min_agg";"0";"352"; - "metricdata_ten_min_agg_app";"0";"352"; - + Table;Count;SizeMB;AvgRowLength; + ... + "metricdata_hour";3422;8;226; + ... + ##Contributing Always feel free to fork and contribute any changes directly here on GitHub. diff --git a/build.gradle b/build.gradle index 555f2a0..a07ba25 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'org.appdynamics' -version = '1.0.1' +version = '1.0.2' description = """""" diff --git a/src/main/java/org/appdynamics/metrics/MetricStorageStat.java b/src/main/java/org/appdynamics/metrics/MetricStorageStat.java index 210db7a..2896620 100644 --- a/src/main/java/org/appdynamics/metrics/MetricStorageStat.java +++ b/src/main/java/org/appdynamics/metrics/MetricStorageStat.java @@ -2,14 +2,16 @@ public class MetricStorageStat { public String table; - public long sizeKB; - public int count; + public long sizeMB; + public long count; + public int avgRowLength; - public MetricStorageStat(String table, long sizeKB, int count) { + public MetricStorageStat(String table, long sizeKB, long count, int avgRowLength) { super(); this.table = table; - this.sizeKB = sizeKB; + this.sizeMB = sizeKB; this.count = count; + this.avgRowLength = avgRowLength; } public String getTable() { @@ -20,25 +22,32 @@ public void setTable(String table) { this.table = table; } - public long getSizeKB() { - return sizeKB; + public long getSizeMB() { + return sizeMB; } - public void setSizeKB(long sizeKB) { - this.sizeKB = sizeKB; + public void setSizeMB(long sizeMB) { + this.sizeMB = sizeMB; } - public int getCount() { + public long getCount() { return count; } - public void setCount(int count) { + public void setCount(long count) { this.count = count; } + public int getAvgRowLength() { + return avgRowLength; + } + + public void setAvgRowLength(int avgRowLength) { + this.avgRowLength = avgRowLength; + } + @Override public String toString() { - return "MetricStorageStat [table=" + table + ", sizeKB=" + sizeKB + ", count=" + count + "]"; + return "MetricStorageStat [table=" + table + ", sizeMB=" + sizeMB + ", count=" + count + ", avgRowLength=" + avgRowLength + "]"; } - } diff --git a/src/main/java/org/appdynamics/metrics/Metrics.java b/src/main/java/org/appdynamics/metrics/Metrics.java index 09d2743..29391ca 100644 --- a/src/main/java/org/appdynamics/metrics/Metrics.java +++ b/src/main/java/org/appdynamics/metrics/Metrics.java @@ -53,7 +53,8 @@ public static void main(String[] args) throws Exception { listMetrics(conn, pgArgs.getArgument(1), out, db); } else if (pgArgs.getArgument(0).equals("metrics-stats")) { conn = DriverManager.getConnection(jdbcUrl); - statsMetrics(conn, pgArgs.getArgument(2), out, db); + int beforeMin = pgArgs.getArgument(1) !=null ? Integer.parseInt(pgArgs.getArgument(1)): 10; + statsMetrics(conn, beforeMin, out, db); } else if (pgArgs.getArgument(0).equals("metrics-stats-storage")) { conn = DriverManager.getConnection(jdbcUrl); statsMetricsStorage(conn, pgArgs.getArgument(2), out, db); @@ -76,7 +77,7 @@ public static void main(String[] args) throws Exception { } private static void displayUsage() { - System.out.println("Usage : [-hostname=] [-port=] [-username=] [-password=] [-filename=] applications|tiers|metrics-list [filter]|metrics-stats-storage||metrics-stats|metrics-delete filter"); + System.out.println("Usage : [-hostname=] [-port=] [-username=] [-password=] [-filename=] applications|tiers|metrics-list [filter]|metrics-stats-storage|metrics-stats [beforeMin]|metrics-delete filter"); System.exit(0); } @@ -84,12 +85,12 @@ private static void applications(Connection conn, PrinterAdapter out) throws SQL Statement stmt = null; ResultSet rs = null; - out.health(); + out.console(); stmt = conn.createStatement(); rs = stmt.executeQuery("SELECT id, name FROM application"); - out.health(); + out.console(); while (rs.next()) { long id = rs.getLong(1); @@ -103,12 +104,12 @@ private static void tiers(Connection conn, PrinterAdapter out) throws SQLExcepti Statement stmt = null; ResultSet rs = null; - out.health(); + out.console(); stmt = conn.createStatement(); rs = stmt.executeQuery("SELECT application_id,id, name FROM application_component"); - out.health(); + out.console(); while (rs.next()) { long app_id = rs.getLong(1); @@ -129,9 +130,9 @@ private static void listMetrics(Connection conn, String filter, PrinterAdapter o out.println(String.format(row, !m.isReferenced() ? "true" : "false", m.getApp_id(), m.getId(), m.getName())); } - private static void statsMetrics(Connection conn, String filter, PrinterAdapter out, String db) throws SQLException, FileNotFoundException { + private static void statsMetrics(Connection conn, int beforeMin, PrinterAdapter out, String db) throws SQLException, FileNotFoundException { - Collection stats = findMetricStats(conn, filter, out, db); + Collection stats = findMetricStats(conn, beforeMin, out, db); String header = "Timestamp;AccountName;ApplicationName;TierName;NodeName;AgentType;MetricsCount;"; String row = "\"%tc\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%d\";"; @@ -146,13 +147,13 @@ private static void statsMetricsStorage(Connection conn, String filter, PrinterA Collection stats = findMetricStatsStorage(conn, filter, out, db); - String header = "Table;Count;SizeKB;"; - String row = "\"%s\";\"%d\";\"%d\";"; + String header = "Table;Count;SizeMB;AvgRowLength"; + String row = "\"%s\";%d;%d;%d;"; out.println(header); for (MetricStorageStat m : stats) - out.println(String.format(row, m.getTable(), m.getCount(), m.getSizeKB())); + out.println(String.format(row, m.getTable(), m.getCount(), m.getSizeMB(), m.getAvgRowLength())); } private static Collection findMetrics(Connection conn, String filter, PrinterAdapter out, String db) throws SQLException { @@ -161,7 +162,7 @@ private static Collection findMetrics(Connection conn, String filter, Pr Statement stmt = null; ResultSet rs = null; - out.health(); + out.console(); stmt = conn.createStatement(); String sql = "SELECT application_id,id, name," + computeIsReferencedMetric(conn, db, "metric") + " FROM metric"; @@ -169,7 +170,7 @@ private static Collection findMetrics(Connection conn, String filter, Pr sql = sql + " where name like '%" + filter + "%'"; rs = stmt.executeQuery(sql); - out.health(); + out.console(); while (rs.next()) { long app_id = rs.getLong(1); @@ -178,25 +179,25 @@ private static Collection findMetrics(Connection conn, String filter, Pr boolean isReferenced = rs.getBoolean(4); metrics.add(new Metric(id, app_id, name, isReferenced)); - out.health(); + out.console(); } return metrics; } - private static Collection findMetricStats(Connection conn, String filter, PrinterAdapter out, String db) throws SQLException { + private static Collection findMetricStats(Connection conn, int beforeMin, PrinterAdapter out, String db) throws SQLException { Collection metricStats = new LinkedList<>(); Statement stmt = null; ResultSet rs = null; - out.health(); + out.console(); stmt = conn.createStatement(); - String sql = "select from_unixtime(mdm.ts_min*60), acc.name, app.name as application, tier.name as tier, node.name as node, m.agent_type, count(*) from metricdata_min mdm join metric m on m.id=mdm.metric_id join application app on app.id=m.application_id join account acc on app.account_id=acc.id left join application_component_node node on node.id=mdm.node_id left join application_component tier on tier.id=node.application_component_id where ts_min = (select max(ts_min) - 0 from metricdata_min) group by 1, 2, 3, 4, 5, 6 order by 1"; + String sql = "select from_unixtime(mdm.ts_min*60), acc.name, app.name as application, tier.name as tier, node.name as node, m.agent_type, count(*) from metricdata_min mdm join metric m on m.id=mdm.metric_id join application app on app.id=m.application_id join account acc on app.account_id=acc.id left join application_component_node node on node.id=mdm.node_id left join application_component tier on tier.id=node.application_component_id where ts_min = (select max(ts_min) - "+beforeMin+" from metricdata_min) group by 1, 2, 3, 4, 5, 6 order by 1"; rs = stmt.executeQuery(sql); - out.health(); + out.console(); while (rs.next()) { Date timestamp = rs.getDate(1); @@ -208,7 +209,7 @@ private static Collection findMetricStats(Connection conn, String fi int metricsCount = rs.getInt(7); metricStats.add(new MetricStat(timestamp, accountName, applicationName, tierName, nodeName, agentType, metricsCount)); - out.health(); + out.console(); } return metricStats; @@ -218,48 +219,23 @@ private static Collection findMetricStatsStorage(Connection c Collection metricStorageStats = new ArrayList(); List tables = new ArrayList(); - Statement stmt = null; - ResultSet rs = null; - - out.health(); - - stmt = conn.createStatement(); - - // Lookup table names - rs = stmt.executeQuery("SELECT table_name FROM information_schema.tables where table_name like 'metricdata%'"); - - while (rs.next()) { - tables.add(rs.getString(1)); - } - - stmt.close(); - - out.health(); + Statement stmt = conn.createStatement(); - // Find sizes - PreparedStatement sizePS = conn.prepareStatement("SELECT ROUND((DATA_LENGTH + INDEX_LENGTH) / 1024) FROM information_schema.TABLES WHERE TABLE_NAME = ?"); - Statement countPS = conn.createStatement(); - long size=0; - int count=0; + ResultSet rs = stmt.executeQuery("SELECT TABLE_NAME, ROUND((DATA_LENGTH + INDEX_LENGTH) / 1024 / 1024), TABLE_ROWS, AVG_ROW_LENGTH FROM information_schema.TABLES order by 2 desc"); + long size=0,count=0; + int avgRowLength=0; + String tableName; - for(String tableName : tables) { - sizePS.setString(1, tableName); - rs = sizePS.executeQuery(); - if(rs.next()) - size = rs.getLong(1); - rs.close(); - - rs = countPS.executeQuery("SELECT COUNT(*) FROM "+tableName); - if(rs.next()) - count = rs.getInt(1); - rs.close(); + while(rs.next()) { + tableName = rs.getString(1); + size = rs.getLong(2); + count = rs.getLong(3); + avgRowLength = rs.getInt(4); - metricStorageStats.add(new MetricStorageStat(tableName, size, count)); - out.health(); + metricStorageStats.add(new MetricStorageStat(tableName, size, count, avgRowLength)); } - sizePS.close(); - countPS.close(); + stmt.close(); return metricStorageStats; } @@ -290,7 +266,7 @@ private static void deleteMetrics(Connection conn, String filter, PrinterAdapter out.println("Deleting : " + metric); } - out.health(); + out.console(); } } catch (Exception e) { conn.rollback(); diff --git a/src/main/java/org/appdynamics/metrics/PrinterAdapter.java b/src/main/java/org/appdynamics/metrics/PrinterAdapter.java index 3ef5a4b..f3b2692 100644 --- a/src/main/java/org/appdynamics/metrics/PrinterAdapter.java +++ b/src/main/java/org/appdynamics/metrics/PrinterAdapter.java @@ -16,12 +16,36 @@ public PrinterAdapter(String filename) throws FileNotFoundException { writer = new PrintWriter(filename); } - public void health() { + public void console() { + console(".",false); + } + + public void consoleln() { + console("",true); + } + + public void console(String value) { + console(value, false); + } + + + public void consoleln(String value) { + console(value, true); + } + + private void console(String value, boolean line) { if(writer!=null) { counter++; - System.out.print("."); - if(counter % 40 == 0) - System.out.println(""); + + if(line) { + System.out.println(value); + counter=0; + } + else { + System.out.print(value); + if(counter % 40 == 0) + System.out.println(""); + } } }