Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/254844
Change subject: Split sql query & exec lines ...................................................................... Split sql query & exec lines Change-Id: I35868e10381bb341388ebf446ac41f1384667a4e --- M graphite/site_stats/active_users.sh M graphite/site_stats/admins.sh M graphite/site_stats/bots.sh M graphite/site_stats/bureaucrats.sh M graphite/site_stats/good_articles.sh M graphite/site_stats/propertycreators.sh M graphite/site_stats/total_edits.sh M graphite/site_stats/total_pages.sh M graphite/site_stats/users.sh 9 files changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-wikidata-data refs/changes/44/254844/1 diff --git a/graphite/site_stats/active_users.sh b/graphite/site_stats/active_users.sh index 2dce5f6..1635e41 100755 --- a/graphite/site_stats/active_users.sh +++ b/graphite/site_stats/active_users.sh @@ -4,6 +4,6 @@ # # See https://www.mediawiki.org/wiki/Manual:Site_stats_table -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select ss_active_users from site_stats" wikidatawiki) - +sql="select ss_active_users from site_stats" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.active_users $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/admins.sh b/graphite/site_stats/admins.sh index bb9fd29..39224b2 100755 --- a/graphite/site_stats/admins.sh +++ b/graphite/site_stats/admins.sh @@ -7,6 +7,6 @@ # # SELECT ug_group, count(*) AS count FROM user_groups GROUP BY ug_group; -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select count(*) as count from user_groups where ug_group = 'sysop' group by ug_group" wikidatawiki) - +sql="select count(*) as count from user_groups where ug_group = 'sysop' group by ug_group" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.user_groups.admins $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/bots.sh b/graphite/site_stats/bots.sh index a34ca33..535c896 100755 --- a/graphite/site_stats/bots.sh +++ b/graphite/site_stats/bots.sh @@ -7,6 +7,6 @@ # # SELECT ug_group, count(*) AS count FROM user_groups GROUP BY ug_group; -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select count(*) as count from user_groups where ug_group = 'bot' group by ug_group" wikidatawiki) - +sql="select count(*) as count from user_groups where ug_group = 'bot' group by ug_group" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.user_groups.bots $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/bureaucrats.sh b/graphite/site_stats/bureaucrats.sh index c834955..bf9e180 100755 --- a/graphite/site_stats/bureaucrats.sh +++ b/graphite/site_stats/bureaucrats.sh @@ -7,6 +7,6 @@ # # SELECT ug_group, count(*) AS count FROM user_groups GROUP BY ug_group; -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select count(*) as count from user_groups where ug_group = 'bureaucrat' group by ug_group" wikidatawiki) - +sql="select count(*) as count from user_groups where ug_group = 'bureaucrat' group by ug_group" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.user_groups.bureaucrats $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/good_articles.sh b/graphite/site_stats/good_articles.sh index eb4fbee..60fd0d8 100755 --- a/graphite/site_stats/good_articles.sh +++ b/graphite/site_stats/good_articles.sh @@ -4,6 +4,6 @@ # # See See https://www.mediawiki.org/wiki/Manual:Site_stats_table -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select ss_good_articles from site_stats" wikidatawiki) - +sql="select ss_good_articles from site_stats" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.good_articles $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/propertycreators.sh b/graphite/site_stats/propertycreators.sh index 3f8196f..d7a8ed3 100755 --- a/graphite/site_stats/propertycreators.sh +++ b/graphite/site_stats/propertycreators.sh @@ -7,6 +7,6 @@ # # SELECT ug_group, count(*) AS count FROM user_groups GROUP BY ug_group; -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select count(*) as count from user_groups where ug_group = 'propertycreator' group by ug_group" wikidatawiki) - +sql="select count(*) as count from user_groups where ug_group = 'propertycreator' group by ug_group" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.user_groups.propertycreators $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/total_edits.sh b/graphite/site_stats/total_edits.sh index c64aa46..d63651b 100755 --- a/graphite/site_stats/total_edits.sh +++ b/graphite/site_stats/total_edits.sh @@ -4,6 +4,6 @@ # # See https://www.mediawiki.org/wiki/Manual:Site_stats_table -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select ss_total_edits from site_stats" wikidatawiki) - +sql="select ss_total_edits from site_stats" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.total_edits $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/total_pages.sh b/graphite/site_stats/total_pages.sh index 0fe1432..601202c 100755 --- a/graphite/site_stats/total_pages.sh +++ b/graphite/site_stats/total_pages.sh @@ -4,6 +4,6 @@ # # See https://www.mediawiki.org/wiki/Manual:Site_stats_table -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select ss_total_pages from site_stats" wikidatawiki) - +sql="select ss_total_pages from site_stats" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.total_pages $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 diff --git a/graphite/site_stats/users.sh b/graphite/site_stats/users.sh index 23065b3..ea2f638 100755 --- a/graphite/site_stats/users.sh +++ b/graphite/site_stats/users.sh @@ -4,6 +4,6 @@ # # See https://www.mediawiki.org/wiki/Manual:Site_stats_table -value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "select ss_users from site_stats" wikidatawiki) - +sql="select ss_users from site_stats" +value=$(mysql --defaults-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store.eqiad.wmnet -A -se "$sql" wikidatawiki) echo "daily.wikidata.site_stats.users $value `date +%s`" | nc -q0 graphite.eqiad.wmnet 2003 -- To view, visit https://gerrit.wikimedia.org/r/254844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35868e10381bb341388ebf446ac41f1384667a4e Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-wikidata-data Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
