OliverKeyes has submitted this change and it was merged.
Change subject: Updated the dashboard to use the new (and correct!) data that
the updated WDQS usage script outputs.
......................................................................
Updated the dashboard to use the new (and correct!) data that the updated WDQS
usage script outputs.
Change-Id: Iea73bd451bc4268a866687fc4bee69c1fc8b8b50
---
M assets/wdqs_basic.md
M server.R
M ui.R
3 files changed, 8 insertions(+), 14 deletions(-)
Approvals:
OliverKeyes: Verified; Looks good to me, approved
diff --git a/assets/wdqs_basic.md b/assets/wdqs_basic.md
index efd15af..203c7a0 100644
--- a/assets/wdqs_basic.md
+++ b/assets/wdqs_basic.md
@@ -1,10 +1,6 @@
Wikidata Query Service (WDQS) usage
=======
-**Requests** in *Daily WDQS usage* are the non-query requests made to `/` and
`/index.php`.
-
-**Events** in *Daily SparQL usage* are the `sparql-results` requests.
-
Outages and inaccuracies
------
diff --git a/server.R b/server.R
index 28fa66d..7eafb15 100644
--- a/server.R
+++ b/server.R
@@ -18,13 +18,11 @@
output$wdqs_usage_plot <- renderDygraph({
wdqs_usage %>%
- dplyr::filter(path %in% c("/", "/index.php") & query == "other") %>%
- dplyr::group_by(timestamp) %>%
- dplyr::summarise(total = sum(events)) %>%
- # tidyr::spread(query, total) %>%
+ dplyr::filter(path == "/" & http_status == 200) %>%
+ dplyr::select(c(timestamp, events)) %>%
{ xts(., order.by = .$timestamp) } %>%
- dygraph(main = "Daily WDQS usage", group = "wdqs_basic",
- xlab = "Date", ylab = "Requests") %>%
+ dygraph(main = "Daily WDQS Homepage usage", group = "wdqs_basic",
+ xlab = "Date", ylab = "Events") %>%
dyOptions(strokeWidth = 3, colors = brewer.pal(3, "Set2")[1],
drawPoints = TRUE, pointSize = 3, labelsKMB = TRUE,
includeZero = TRUE) %>%
@@ -33,10 +31,10 @@
output$sparql_usage_plot <- renderDygraph({
wdqs_usage %>%
- dplyr::filter(path == "/bigdata/namespace/wdq/sparql" & content ==
"sparql results") %>%
+ dplyr::filter(path == "/bigdata/namespace/wdq/sparql" & http_status ==
"200") %>%
dplyr::select(c(timestamp, events)) %>%
{ xts(., order.by = .$timestamp) } %>%
- dygraph(main = "Daily SparkQL usage", group = "wdqs_basic",
+ dygraph(main = "Daily SPARQL usage", group = "wdqs_basic",
xlab = "Date", ylab = "Events") %>%
dyOptions(strokeWidth = 3, colors = brewer.pal(3, "Set2")[2],
drawPoints = TRUE, pointSize = 3, labelsKMB = TRUE,
diff --git a/ui.R b/ui.R
index b69bb5f..bdc237b 100644
--- a/ui.R
+++ b/ui.R
@@ -20,8 +20,8 @@
body <- dashboardBody(
tabItems(
tabItem(tabName = "wdqs_usage",
- fluidRow(column(dygraphOutput("wdqs_usage_plot"), width = 6),
- column(dygraphOutput("sparql_usage_plot"), width = 6)),
+ dygraphOutput("wdqs_usage_plot", height = "200px"),
+ dygraphOutput("sparql_usage_plot", height = "200px"),
includeMarkdown("./assets/wdqs_basic.md"))
) # /tabItems
) # /dashboardBody
--
To view, visit https://gerrit.wikimedia.org/r/236056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea73bd451bc4268a866687fc4bee69c1fc8b8b50
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/twilightsparql
Gerrit-Branch: master
Gerrit-Owner: Bearloga <[email protected]>
Gerrit-Reviewer: OliverKeyes <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
