|
 |
28bab8 |
From 9be0992e4b6e459ba64c9f2433a5a022dd0b21fa Mon Sep 17 00:00:00 2001
|
|
|
28bab8 |
From: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
28bab8 |
Date: Thu, 24 Mar 2016 16:04:25 +0100
|
|
|
28bab8 |
Subject: [PATCH] Add workflow for RHEL anonymous report
|
|
|
28bab8 |
|
|
|
28bab8 |
Make name and descritpion of RHEL's workflow more obvious.
|
|
|
28bab8 |
|
|
|
28bab8 |
Related: #1258482
|
|
|
28bab8 |
|
|
|
28bab8 |
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
28bab8 |
---
|
|
|
28bab8 |
doc/Makefile.am | 1 +
|
|
|
28bab8 |
doc/report_uReport.conf.txt | 41 ++++++++++++++++++++++++++++
|
|
|
28bab8 |
po/POTFILES.in | 1 +
|
|
|
28bab8 |
src/plugins/report_RHTSupport.xml.in | 11 ++++----
|
|
|
28bab8 |
src/plugins/report_uReport.xml.in | 11 ++++----
|
|
|
28bab8 |
src/workflows/Makefile.am | 3 ++
|
|
|
28bab8 |
src/workflows/report_uReport.conf | 3 ++
|
|
|
28bab8 |
src/workflows/workflow_RHELCCpp.xml.in | 4 +--
|
|
|
28bab8 |
src/workflows/workflow_RHELJava.xml.in | 4 +--
|
|
|
28bab8 |
src/workflows/workflow_RHELKerneloops.xml.in | 4 +--
|
|
|
28bab8 |
src/workflows/workflow_RHELLibreport.xml.in | 4 +--
|
|
|
28bab8 |
src/workflows/workflow_RHELPython.xml.in | 4 +--
|
|
|
28bab8 |
src/workflows/workflow_RHELvmcore.xml.in | 4 +--
|
|
|
28bab8 |
src/workflows/workflow_RHELxorg.xml.in | 4 +--
|
|
|
28bab8 |
src/workflows/workflow_uReport.xml.in | 9 ++++++
|
|
|
28bab8 |
15 files changed, 84 insertions(+), 24 deletions(-)
|
|
|
28bab8 |
create mode 100644 doc/report_uReport.conf.txt
|
|
|
28bab8 |
create mode 100644 src/workflows/report_uReport.conf
|
|
|
28bab8 |
create mode 100644 src/workflows/workflow_uReport.xml.in
|
|
|
28bab8 |
|
|
|
28bab8 |
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
|
|
28bab8 |
index da4785e..9376984 100644
|
|
|
28bab8 |
--- a/doc/Makefile.am
|
|
|
28bab8 |
+++ b/doc/Makefile.am
|
|
|
28bab8 |
@@ -48,6 +48,7 @@ MAN5_TXT += report_fedora.conf.txt
|
|
|
28bab8 |
MAN5_TXT += report_Logger.conf.txt
|
|
|
28bab8 |
MAN5_TXT += report_rhel.conf.txt
|
|
|
28bab8 |
MAN5_TXT += report_rhel_bugzilla.conf.txt
|
|
|
28bab8 |
+MAN5_TXT += report_uReport.conf.txt
|
|
|
28bab8 |
MAN5_TXT += report_logger.conf.txt
|
|
|
28bab8 |
MAN5_TXT += report_mailx.conf.txt
|
|
|
28bab8 |
MAN5_TXT += report_uploader.conf.txt
|
|
|
28bab8 |
diff --git a/doc/report_uReport.conf.txt b/doc/report_uReport.conf.txt
|
|
|
28bab8 |
new file mode 100644
|
|
|
28bab8 |
index 0000000..07fa836
|
|
|
28bab8 |
--- /dev/null
|
|
|
28bab8 |
+++ b/doc/report_uReport.conf.txt
|
|
|
28bab8 |
@@ -0,0 +1,41 @@
|
|
|
28bab8 |
+report_uReport.conf(5)
|
|
|
28bab8 |
+======================
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+NAME
|
|
|
28bab8 |
+----
|
|
|
28bab8 |
+report_uReport.conf - configuration file for libreport.
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+DESCRIPTION
|
|
|
28bab8 |
+-----------
|
|
|
28bab8 |
+This configuration file specifies which of the reporting work flow definitions
|
|
|
28bab8 |
+are applicable for all problems types on Red Hat Enterprise Linux.
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+All applicable work flows are presented to users in User Interface as
|
|
|
28bab8 |
+possibilities for processing of any problems. A particular work flow becomes
|
|
|
28bab8 |
+applicable if its conditions are satisfied.
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+This configuration file consists from one condition per line.
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+Each condition line must start with EVENT=workflow_NAME where "workflow_" is
|
|
|
28bab8 |
+constant prefix and "workflow_NAME" is base name of path to reporting work flow
|
|
|
28bab8 |
+configuration file.
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+The rest of condition line has form VAR=VAL, VAR!=VAL or VAL~=REGEX, where VAR
|
|
|
28bab8 |
+is a name of problem directory element to be checked (for example,
|
|
|
28bab8 |
+"executable", "package", hostname" etc). The condition may consists
|
|
|
28bab8 |
+from as many element checks as it is necessary.
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+EXAMPLES
|
|
|
28bab8 |
+--------
|
|
|
28bab8 |
+Condition line::
|
|
|
28bab8 |
+ EVENT=workflow_uReport
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+The condition line above expects existence of /usr/share/libreport/workflows/workflow_uReport.xml
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+SEE ALSO
|
|
|
28bab8 |
+--------
|
|
|
28bab8 |
+report-gtk(1)
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+AUTHOR
|
|
|
28bab8 |
+------
|
|
|
28bab8 |
+* ABRT team
|
|
|
28bab8 |
diff --git a/po/POTFILES.in b/po/POTFILES.in
|
|
|
28bab8 |
index 1222c95..d843de1 100644
|
|
|
28bab8 |
--- a/po/POTFILES.in
|
|
|
28bab8 |
+++ b/po/POTFILES.in
|
|
|
28bab8 |
@@ -64,6 +64,7 @@ src/workflows/workflow_MailxCCpp.xml.in
|
|
|
28bab8 |
src/workflows/workflow_Mailx.xml.in
|
|
|
28bab8 |
src/workflows/workflow_UploadCCpp.xml.in
|
|
|
28bab8 |
src/workflows/workflow_Upload.xml.in
|
|
|
28bab8 |
+src/workflows/workflow_uReport.xml.in
|
|
|
28bab8 |
src/workflows/workflow_RHELCCpp.xml.in
|
|
|
28bab8 |
src/workflows/workflow_RHELKerneloops.xml.in
|
|
|
28bab8 |
src/workflows/workflow_RHELPython.xml.in
|
|
|
28bab8 |
diff --git a/src/plugins/report_RHTSupport.xml.in b/src/plugins/report_RHTSupport.xml.in
|
|
|
28bab8 |
index b7a7872..60e18d9 100644
|
|
|
28bab8 |
--- a/src/plugins/report_RHTSupport.xml.in
|
|
|
28bab8 |
+++ b/src/plugins/report_RHTSupport.xml.in
|
|
|
28bab8 |
@@ -4,6 +4,7 @@
|
|
|
28bab8 |
<_description>Report to Red Hat support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<requires-items>package</requires-items>
|
|
|
28bab8 |
+ <requires-details>yes</requires-details>
|
|
|
28bab8 |
<exclude-items-by-default>count,event_log,vmcore</exclude-items-by-default>
|
|
|
28bab8 |
<exclude-items-always></exclude-items-always>
|
|
|
28bab8 |
<exclude-binary-items>no</exclude-binary-items>
|
|
|
28bab8 |
@@ -24,11 +25,6 @@
|
|
|
28bab8 |
<_description>Red Hat customer password</_description>
|
|
|
28bab8 |
<allow-empty>no</allow-empty>
|
|
|
28bab8 |
</option>
|
|
|
28bab8 |
- <option type="bool" name="RHTSupport_SSLVerify">
|
|
|
28bab8 |
- <_label>Verify SSL</_label>
|
|
|
28bab8 |
- <_description>Check SSL key validity</_description>
|
|
|
28bab8 |
- <default-value>yes</default-value>
|
|
|
28bab8 |
- </option>
|
|
|
28bab8 |
<advanced-options>
|
|
|
28bab8 |
<option type="bool" name="RHTSupport_SubmitUReport">
|
|
|
28bab8 |
<_label>Submit uReport</_label>
|
|
|
28bab8 |
@@ -41,6 +37,11 @@
|
|
|
28bab8 |
<_description>Address of the Red Hat support portal</_description>
|
|
|
28bab8 |
<default-value>https://api.access.redhat.com/rs</default-value>
|
|
|
28bab8 |
</option>
|
|
|
28bab8 |
+ <option type="bool" name="RHTSupport_SSLVerify">
|
|
|
28bab8 |
+ <_label>Verify SSL</_label>
|
|
|
28bab8 |
+ <_description>Check SSL key validity</_description>
|
|
|
28bab8 |
+ <default-value>yes</default-value>
|
|
|
28bab8 |
+ </option>
|
|
|
28bab8 |
<option type="text" name="http_proxy">
|
|
|
28bab8 |
<_label>HTTP Proxy</_label>
|
|
|
28bab8 |
<allow-empty>yes</allow-empty>
|
|
|
28bab8 |
diff --git a/src/plugins/report_uReport.xml.in b/src/plugins/report_uReport.xml.in
|
|
|
28bab8 |
index 63dfc22..b997851 100644
|
|
|
28bab8 |
--- a/src/plugins/report_uReport.xml.in
|
|
|
28bab8 |
+++ b/src/plugins/report_uReport.xml.in
|
|
|
28bab8 |
@@ -5,6 +5,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<requires-items>analyzer,reason,executable,pkg_epoch,pkg_name,pkg_version,pkg_release,pkg_arch,os_release,architecture,core_backtrace</requires-items>
|
|
|
28bab8 |
<gui-review-elements>no</gui-review-elements>
|
|
|
28bab8 |
+ <minimal-rating>0</minimal-rating>
|
|
|
28bab8 |
|
|
|
28bab8 |
<options>
|
|
|
28bab8 |
<option type="text" name="uReport_URL">
|
|
|
28bab8 |
@@ -18,12 +19,12 @@
|
|
|
28bab8 |
<_description>Email address that can be used by ABRT server to inform you about news and updates</_description>
|
|
|
28bab8 |
<allow-empty>yes</allow-empty>
|
|
|
28bab8 |
</option>
|
|
|
28bab8 |
- <option type="bool" name="uReport_SSLVerify">
|
|
|
28bab8 |
- <_label>Verify SSL</_label>
|
|
|
28bab8 |
- <_description>Check SSL key validity</_description>
|
|
|
28bab8 |
- <default-value>yes</default-value>
|
|
|
28bab8 |
- </option>
|
|
|
28bab8 |
<advanced-options>
|
|
|
28bab8 |
+ <option type="bool" name="uReport_SSLVerify">
|
|
|
28bab8 |
+ <_label>Verify SSL</_label>
|
|
|
28bab8 |
+ <_description>Check SSL key validity</_description>
|
|
|
28bab8 |
+ <default-value>yes</default-value>
|
|
|
28bab8 |
+ </option>
|
|
|
28bab8 |
<option type="text" name="http_proxy">
|
|
|
28bab8 |
<_label>HTTP Proxy</_label>
|
|
|
28bab8 |
<allow-empty>yes</allow-empty>
|
|
|
28bab8 |
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
|
|
|
28bab8 |
index 0fc1019..72502ca 100644
|
|
|
28bab8 |
--- a/src/workflows/Makefile.am
|
|
|
28bab8 |
+++ b/src/workflows/Makefile.am
|
|
|
28bab8 |
@@ -15,6 +15,7 @@ dist_workflows_DATA = \
|
|
|
28bab8 |
workflow_RHELxorg.xml \
|
|
|
28bab8 |
workflow_RHELLibreport.xml \
|
|
|
28bab8 |
workflow_RHELJava.xml \
|
|
|
28bab8 |
+ workflow_uReport.xml \
|
|
|
28bab8 |
workflow_Mailx.xml \
|
|
|
28bab8 |
workflow_MailxCCpp.xml \
|
|
|
28bab8 |
workflow_Upload.xml \
|
|
|
28bab8 |
@@ -42,6 +43,7 @@ workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
|
|
|
28bab8 |
dist_workflowsdef_DATA =\
|
|
|
28bab8 |
report_fedora.conf \
|
|
|
28bab8 |
report_rhel.conf \
|
|
|
28bab8 |
+ report_uReport.conf \
|
|
|
28bab8 |
report_mailx.conf \
|
|
|
28bab8 |
report_logger.conf \
|
|
|
28bab8 |
report_uploader.conf
|
|
|
28bab8 |
@@ -62,6 +64,7 @@ EXTRA_DIST = \
|
|
|
28bab8 |
workflow_FedoraXorg.xml.in \
|
|
|
28bab8 |
workflow_FedoraLibreport.xml.in \
|
|
|
28bab8 |
workflow_FedoraJava.xml.in \
|
|
|
28bab8 |
+ workflow_uReport.xml.in \
|
|
|
28bab8 |
workflow_RHELCCpp.xml.in \
|
|
|
28bab8 |
workflow_RHELKerneloops.xml.in \
|
|
|
28bab8 |
workflow_RHELPython.xml.in \
|
|
|
28bab8 |
diff --git a/src/workflows/report_uReport.conf b/src/workflows/report_uReport.conf
|
|
|
28bab8 |
new file mode 100644
|
|
|
28bab8 |
index 0000000..8d76d5a
|
|
|
28bab8 |
--- /dev/null
|
|
|
28bab8 |
+++ b/src/workflows/report_uReport.conf
|
|
|
28bab8 |
@@ -0,0 +1,3 @@
|
|
|
28bab8 |
+EVENT=workflow_uReport
|
|
|
28bab8 |
+# this is just a meta event which consists of other events
|
|
|
28bab8 |
+# the list is defined in the xml file
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_RHELCCpp.xml.in b/src/workflows/workflow_RHELCCpp.xml.in
|
|
|
28bab8 |
index 4d0251a..95e1ad0 100644
|
|
|
28bab8 |
--- a/src/workflows/workflow_RHELCCpp.xml.in
|
|
|
28bab8 |
+++ b/src/workflows/workflow_RHELCCpp.xml.in
|
|
|
28bab8 |
@@ -1,7 +1,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<workflow>
|
|
|
28bab8 |
- <_name>Report to Red Hat Customer Portal</_name>
|
|
|
28bab8 |
- <_description>Process the C/C++ crash using the Red Hat infrastructure</_description>
|
|
|
28bab8 |
+ <_name>Ask Red Hat Support for help</_name>
|
|
|
28bab8 |
+ <_description>Create new Red Hat Support case - I would like to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<events>
|
|
|
28bab8 |
<event>collect_*</event>
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_RHELJava.xml.in b/src/workflows/workflow_RHELJava.xml.in
|
|
|
28bab8 |
index 23ef0cb..95e1ad0 100644
|
|
|
28bab8 |
--- a/src/workflows/workflow_RHELJava.xml.in
|
|
|
28bab8 |
+++ b/src/workflows/workflow_RHELJava.xml.in
|
|
|
28bab8 |
@@ -1,7 +1,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<workflow>
|
|
|
28bab8 |
- <_name>Report to Red Hat Customer Portal</_name>
|
|
|
28bab8 |
- <_description>Process the Java exception using the Red Hat infrastructure</_description>
|
|
|
28bab8 |
+ <_name>Ask Red Hat Support for help</_name>
|
|
|
28bab8 |
+ <_description>Create new Red Hat Support case - I would like to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<events>
|
|
|
28bab8 |
<event>collect_*</event>
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_RHELKerneloops.xml.in b/src/workflows/workflow_RHELKerneloops.xml.in
|
|
|
28bab8 |
index 941a898..95e1ad0 100644
|
|
|
28bab8 |
--- a/src/workflows/workflow_RHELKerneloops.xml.in
|
|
|
28bab8 |
+++ b/src/workflows/workflow_RHELKerneloops.xml.in
|
|
|
28bab8 |
@@ -1,7 +1,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<workflow>
|
|
|
28bab8 |
- <_name>Report to Red Hat Customer Portal</_name>
|
|
|
28bab8 |
- <_description>Process the kerneloops using the Red Hat infrastructure</_description>
|
|
|
28bab8 |
+ <_name>Ask Red Hat Support for help</_name>
|
|
|
28bab8 |
+ <_description>Create new Red Hat Support case - I would like to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<events>
|
|
|
28bab8 |
<event>collect_*</event>
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_RHELLibreport.xml.in b/src/workflows/workflow_RHELLibreport.xml.in
|
|
|
28bab8 |
index b8b4f04..b211ae7 100644
|
|
|
28bab8 |
--- a/src/workflows/workflow_RHELLibreport.xml.in
|
|
|
28bab8 |
+++ b/src/workflows/workflow_RHELLibreport.xml.in
|
|
|
28bab8 |
@@ -1,7 +1,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<workflow>
|
|
|
28bab8 |
- <_name>Report to Red Hat Customer Portal</_name>
|
|
|
28bab8 |
- <_description>Process the problem using the Red Hat infrastructure</_description>
|
|
|
28bab8 |
+ <_name>Ask Red Hat Support for help</_name>
|
|
|
28bab8 |
+ <_description>Create new Red Hat Support case - I would like to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<events>
|
|
|
28bab8 |
<event>report_RHTSupport</event>
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_RHELPython.xml.in b/src/workflows/workflow_RHELPython.xml.in
|
|
|
28bab8 |
index ee1c4e7..95e1ad0 100644
|
|
|
28bab8 |
--- a/src/workflows/workflow_RHELPython.xml.in
|
|
|
28bab8 |
+++ b/src/workflows/workflow_RHELPython.xml.in
|
|
|
28bab8 |
@@ -1,7 +1,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<workflow>
|
|
|
28bab8 |
- <_name>Report to Red Hat Customer Portal</_name>
|
|
|
28bab8 |
- <_description>Process the python exception using the Red Hat infrastructure</_description>
|
|
|
28bab8 |
+ <_name>Ask Red Hat Support for help</_name>
|
|
|
28bab8 |
+ <_description>Create new Red Hat Support case - I would like to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<events>
|
|
|
28bab8 |
<event>collect_*</event>
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_RHELvmcore.xml.in b/src/workflows/workflow_RHELvmcore.xml.in
|
|
|
28bab8 |
index f2a775d..8ab6e1a 100644
|
|
|
28bab8 |
--- a/src/workflows/workflow_RHELvmcore.xml.in
|
|
|
28bab8 |
+++ b/src/workflows/workflow_RHELvmcore.xml.in
|
|
|
28bab8 |
@@ -1,7 +1,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<workflow>
|
|
|
28bab8 |
- <_name>Report to Red Hat Customer Portal</_name>
|
|
|
28bab8 |
- <_description>Process the kernel crash using the Red Hat infrastructure</_description>
|
|
|
28bab8 |
+ <_name>Ask Red Hat Support for help</_name>
|
|
|
28bab8 |
+ <_description>Create new Red Hat Support case - I would like to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<events>
|
|
|
28bab8 |
<event>collect_*</event>
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_RHELxorg.xml.in b/src/workflows/workflow_RHELxorg.xml.in
|
|
|
28bab8 |
index 13697b9..b211ae7 100644
|
|
|
28bab8 |
--- a/src/workflows/workflow_RHELxorg.xml.in
|
|
|
28bab8 |
+++ b/src/workflows/workflow_RHELxorg.xml.in
|
|
|
28bab8 |
@@ -1,7 +1,7 @@
|
|
|
28bab8 |
|
|
|
28bab8 |
<workflow>
|
|
|
28bab8 |
- <_name>Report to Red Hat Customer Portal</_name>
|
|
|
28bab8 |
- <_description>Process the X Server problem using the Red Hat infrastructure</_description>
|
|
|
28bab8 |
+ <_name>Ask Red Hat Support for help</_name>
|
|
|
28bab8 |
+ <_description>Create new Red Hat Support case - I would like to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
|
|
|
28bab8 |
<events>
|
|
|
28bab8 |
<event>report_RHTSupport</event>
|
|
|
28bab8 |
diff --git a/src/workflows/workflow_uReport.xml.in b/src/workflows/workflow_uReport.xml.in
|
|
|
28bab8 |
new file mode 100644
|
|
|
28bab8 |
index 0000000..83ff515
|
|
|
28bab8 |
--- /dev/null
|
|
|
28bab8 |
+++ b/src/workflows/workflow_uReport.xml.in
|
|
|
28bab8 |
@@ -0,0 +1,9 @@
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+<workflow>
|
|
|
28bab8 |
+ <_name>Submit anonymous crash report</_name>
|
|
|
28bab8 |
+ <_description>Submit anonymous crash report - I do not want to be contacted by Red Hat Support</_description>
|
|
|
28bab8 |
+
|
|
|
28bab8 |
+ <events>
|
|
|
28bab8 |
+ <event>report_uReport</event>
|
|
|
28bab8 |
+ </events>
|
|
|
28bab8 |
+</workflow>
|
|
|
28bab8 |
--
|
|
|
28bab8 |
1.8.3.1
|
|
|
28bab8 |
|