[MediaWiki-commits] [Gerrit] Improve pageview & projectview oozie error emails - change (analytics/refinery)
Ottomata has submitted this change and it was merged.
Change subject: Improve pageview & projectview oozie error emails
..
Improve pageview & projectview oozie error emails
Add error information in existing pageview & projectview/geo error emails.
Add error emails in projectview/hourly.
Correct projectview/geo archive to use .gz filtering.
Change-Id: I710d3c5cc53359e77803994d534eb63427a48183
---
M oozie/pageview/hourly/workflow.xml
M oozie/projectview/geo/coordinator.xml
M oozie/projectview/geo/workflow.xml
M oozie/projectview/hourly/coordinator.properties
M oozie/projectview/hourly/coordinator.xml
M oozie/projectview/hourly/workflow.xml
6 files changed, 73 insertions(+), 10 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/oozie/pageview/hourly/workflow.xml
b/oozie/pageview/hourly/workflow.xml
index ece5b4a..c2e68d8 100644
--- a/oozie/pageview/hourly/workflow.xml
+++ b/oozie/pageview/hourly/workflow.xml
@@ -333,17 +333,21 @@
-parent_name
-${wf:name()}
-
-
subject
Unexpected values in pageview for workflow -
${wf:name()}
+
+
+body
+Values were found in pageview that were not in the
whitelist.
+
+Please have a look and take necessary action !
+Thanks :)
+-- Oozie
-
+
@@ -355,6 +359,18 @@
parent_name
${wf:name()}
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
diff --git a/oozie/projectview/geo/coordinator.xml
b/oozie/projectview/geo/coordinator.xml
index d1178a1..59815b7 100644
--- a/oozie/projectview/geo/coordinator.xml
+++ b/oozie/projectview/geo/coordinator.xml
@@ -31,6 +31,7 @@
mark_directory_done_workflow_file
archive_job_output_workflow_file
+send_error_email_workflow_file
diff --git a/oozie/projectview/geo/workflow.xml
b/oozie/projectview/geo/workflow.xml
index 418ca54..482e677 100644
--- a/oozie/projectview/geo/workflow.xml
+++ b/oozie/projectview/geo/workflow.xml
@@ -149,7 +149,7 @@
expected_filename_ending
-EMPTY
+.gz
archive_file
@@ -170,6 +170,18 @@
parent_name
${wf:name()}
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
diff --git a/oozie/projectview/hourly/coordinator.properties
b/oozie/projectview/hourly/coordinator.properties
index c598270..e605464 100644
--- a/oozie/projectview/hourly/coordinator.properties
+++ b/oozie/projectview/hourly/coordinator.properties
@@ -48,6 +48,8 @@
mark_directory_done_workflow_file =
${oozie_directory}/util/mark_directory_done/workflow.xml
# HDFS path to workflow to archive output.
archive_job_output_workflow_file =
${oozie_directory}/util/archive_job_output/workflow.xml
+# Workflow to send an error email
+send_error_email_workflow_file=
${oozie_directory}/util/send_error_email/workflow.xml
# HDFS path to hive-site.xml file. This is needed to run hive actions.
hive_site_xml = ${oozie_directory}/util/hive/hive-site.xml
diff --git a/oozie/projectview/hourly/coordinator.xml
b/oozie/projectview/hourly/coordinator.xml
index c95dc4e..da8281c 100644
--- a/oozie/projectview/hourly/coordinator.xml
+++ b/oozie/projectview/hourly/coordinator.xml
@@ -33,6 +33,7 @@
mark_directory_done_workflow_file
archive_job_output_workflow_file
+send_error_email_workflow_file
diff --git a/oozie/projectview/hourly/workflow.xml
b/oozie/projectview/hourly/workflow.xml
index 15eadd6..a9d8a3e 100644
--- a/oozie/projectview/hourly/workflow.xml
+++ b/oozie/projectview/hourly/workflow.xml
@@ -101,6 +101,10 @@
archive_job_output_workflow_file
Workflow to move a data file to the
archive
+
+
[MediaWiki-commits] [Gerrit] Improve pageview & projectview oozie error emails - change (analytics/refinery)
Joal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274693
Change subject: Improve pageview & projectview oozie error emails
..
Improve pageview & projectview oozie error emails
Add error information in existing pageview & projectview/geo error emails.
Add error emails in projectview/hourly.
Change-Id: I710d3c5cc53359e77803994d534eb63427a48183
---
M oozie/pageview/hourly/workflow.xml
M oozie/projectview/geo/coordinator.xml
M oozie/projectview/geo/workflow.xml
M oozie/projectview/hourly/coordinator.properties
M oozie/projectview/hourly/coordinator.xml
M oozie/projectview/hourly/workflow.xml
6 files changed, 72 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/93/274693/1
diff --git a/oozie/pageview/hourly/workflow.xml
b/oozie/pageview/hourly/workflow.xml
index ece5b4a..c2e68d8 100644
--- a/oozie/pageview/hourly/workflow.xml
+++ b/oozie/pageview/hourly/workflow.xml
@@ -333,17 +333,21 @@
-parent_name
-${wf:name()}
-
-
subject
Unexpected values in pageview for workflow -
${wf:name()}
+
+
+body
+Values were found in pageview that were not in the
whitelist.
+
+Please have a look and take necessary action !
+Thanks :)
+-- Oozie
-
+
@@ -355,6 +359,18 @@
parent_name
${wf:name()}
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
diff --git a/oozie/projectview/geo/coordinator.xml
b/oozie/projectview/geo/coordinator.xml
index d1178a1..59815b7 100644
--- a/oozie/projectview/geo/coordinator.xml
+++ b/oozie/projectview/geo/coordinator.xml
@@ -31,6 +31,7 @@
mark_directory_done_workflow_file
archive_job_output_workflow_file
+send_error_email_workflow_file
diff --git a/oozie/projectview/geo/workflow.xml
b/oozie/projectview/geo/workflow.xml
index 418ca54..b0ed42a 100644
--- a/oozie/projectview/geo/workflow.xml
+++ b/oozie/projectview/geo/workflow.xml
@@ -170,6 +170,18 @@
parent_name
${wf:name()}
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
diff --git a/oozie/projectview/hourly/coordinator.properties
b/oozie/projectview/hourly/coordinator.properties
index c598270..e605464 100644
--- a/oozie/projectview/hourly/coordinator.properties
+++ b/oozie/projectview/hourly/coordinator.properties
@@ -48,6 +48,8 @@
mark_directory_done_workflow_file =
${oozie_directory}/util/mark_directory_done/workflow.xml
# HDFS path to workflow to archive output.
archive_job_output_workflow_file =
${oozie_directory}/util/archive_job_output/workflow.xml
+# Workflow to send an error email
+send_error_email_workflow_file=
${oozie_directory}/util/send_error_email/workflow.xml
# HDFS path to hive-site.xml file. This is needed to run hive actions.
hive_site_xml = ${oozie_directory}/util/hive/hive-site.xml
diff --git a/oozie/projectview/hourly/coordinator.xml
b/oozie/projectview/hourly/coordinator.xml
index c95dc4e..da8281c 100644
--- a/oozie/projectview/hourly/coordinator.xml
+++ b/oozie/projectview/hourly/coordinator.xml
@@ -33,6 +33,7 @@
mark_directory_done_workflow_file
archive_job_output_workflow_file
+send_error_email_workflow_file
diff --git a/oozie/projectview/hourly/workflow.xml
b/oozie/projectview/hourly/workflow.xml
index 15eadd6..a9d8a3e 100644
--- a/oozie/projectview/hourly/workflow.xml
+++ b/oozie/projectview/hourly/workflow.xml
@@ -101,6 +101,10 @@
archive_job_output_workflow_file
Workflow to move a data file to the
archive
+
+send_error_email_workflow_file
+Workflow for sending an email
+
@@ -142,7 +146,7 @@
-
+
@@ -156,7 +160,7 @@
