diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 5369026351f31f348e1e49b533ae3dc33b358e7d..5081da060b0051c4ec75991d416f9be3a0fe1b48 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -4394,30 +4394,6 @@ local0.* /var/log/postgresql
</listitem>
</varlistentry>
- <varlistentry id="guc-cluster-name" xreflabel="cluster_name">
- <term><varname>cluster_name</varname> (<type>string</type>)
- <indexterm>
- <primary><varname>cluster_name</> configuration parameter</primary>
- </indexterm>
- </term>
- <listitem>
- <para>
- Sets the cluster name that appears in the process title for all
- processes in this cluster. The name can be any string of less than
- <symbol>NAMEDATALEN</> characters (64 characters in a standard
- build). Only printable ASCII characters may be used in the
- <varname>cluster_name</varname> value. Other characters will be
- replaced with question marks (<literal>?</literal>). No name is shown
- if this parameter is set to the empty string <literal>''</> (which is
- the default). This parameter can only be set at server start.
- </para>
- <para>
- The process title is typically viewed using programs like
- <application>ps</> or, on Windows, <application>Process Explorer</>.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><varname>debug_print_parse</varname> (<type>boolean</type>)
<indexterm>
@@ -5010,9 +4986,61 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
</listitem>
</orderedlist>
</para>
-
</sect2>
- </sect1>
+
+ <sect2>
+ <title>Process Title</title>
+
+ <para>
+ These settings control how the process title as seen
+ by <command>ps</command> is modified. See <xref linkend="monitoring-ps">
+ for details.
+ </para>
+
+ <variablelist>
+ <varlistentry id="guc-cluster-name" xreflabel="cluster_name">
+ <term><varname>cluster_name</varname> (<type>string</type>)
+ <indexterm>
+ <primary><varname>cluster_name</> configuration parameter</primary>
+ </indexterm>
+ </term>
+ <listitem>
+ <para>
+ Sets the cluster name that appears in the process title for all
+ processes in this cluster. The name can be any string of less than
+ <symbol>NAMEDATALEN</> characters (64 characters in a standard
+ build). Only printable ASCII characters may be used in the
+ <varname>cluster_name</varname> value. Other characters will be
+ replaced with question marks (<literal>?</literal>). No name is shown
+ if this parameter is set to the empty string <literal>''</> (which is
+ the default). This parameter can only be set at server start.
+ </para>
+ <para>
+ The process title is typically viewed using programs like
+ <application>ps</> or, on Windows, <application>Process Explorer</>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="guc-update-process-title" xreflabel="update_process_title">
+ <term><varname>update_process_title</varname> (<type>boolean</type>)
+ <indexterm>
+ <primary><varname>update_process_title</> configuration parameter</primary>
+ </indexterm>
+ </term>
+ <listitem>
+ <para>
+ Enables updating of the process title every time a new SQL command
+ is received by the server. The process title is typically viewed
+ by the <command>ps</> command,
+ or in Windows by using the <application>Process Explorer</>.
+ Only superusers can change this setting.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect2>
+ </sect1>
<sect1 id="runtime-config-statistics">
<title>Run-time Statistics</title>
@@ -5130,23 +5158,6 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
</listitem>
</varlistentry>
- <varlistentry id="guc-update-process-title" xreflabel="update_process_title">
- <term><varname>update_process_title</varname> (<type>boolean</type>)
- <indexterm>
- <primary><varname>update_process_title</> configuration parameter</primary>
- </indexterm>
- </term>
- <listitem>
- <para>
- Enables updating of the process title every time a new SQL command
- is received by the server. The process title is typically viewed
- by the <command>ps</> command,
- or in Windows by using the <application>Process Explorer</>.
- Only superusers can change this setting.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry id="guc-stats-temp-directory" xreflabel="stats_temp_directory">
<term><varname>stats_temp_directory</varname> (<type>string</type>)
<indexterm>
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 7684bff79b15cdc1f4df5d8c121f3cb347615002..71090f2d4f1e0f942555902aaa3eb840b1ab98d5 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -580,6 +580,8 @@ const char *const config_group_names[] =
gettext_noop("Reporting and Logging / When to Log"),
/* LOGGING_WHAT */
gettext_noop("Reporting and Logging / What to Log"),
+ /* PROCESS_TITLE */
+ gettext_noop("Process Title"),
/* STATS */
gettext_noop("Statistics"),
/* STATS_MONITORING */
@@ -1180,7 +1182,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"update_process_title", PGC_SUSET, STATS_COLLECTOR,
+ {"update_process_title", PGC_SUSET, PROCESS_TITLE,
gettext_noop("Updates the process title to show the active SQL command."),
gettext_noop("Enables updating of the process title every time a new SQL command is received by the server.")
},
@@ -3395,7 +3397,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"cluster_name", PGC_POSTMASTER, LOGGING_WHAT,
+ {"cluster_name", PGC_POSTMASTER, PROCESS_TITLE,
gettext_noop("Sets the name of the cluster which is included in the process title."),
NULL,
GUC_IS_NAME
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index b2adda95958c4fc814d734acccab8e0fa5651bd4..dcf929f9937d1ef1d082c224d358069a4e620257 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -447,8 +447,13 @@
# than the specified size in kilobytes;
# -1 disables, 0 logs all temp files
#log_timezone = 'GMT'
+
+
+# - Process Title -
+
#cluster_name = '' # added to process titles if nonempty
# (change requires restart)
+#update_process_title = on
#------------------------------------------------------------------------------
@@ -462,7 +467,6 @@
#track_io_timing = off
#track_functions = none # none, pl, all
#track_activity_query_size = 1024 # (change requires restart)
-#update_process_title = on
#stats_temp_directory = 'pg_stat_tmp'
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 7a58ddb10b6b9180662ffa935da9f8100ff397d4..8da2e78a4739f6eaf130ba1d2e723a24b4bea6be 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -81,6 +81,7 @@ enum config_group
LOGGING_WHERE,
LOGGING_WHEN,
LOGGING_WHAT,
+ PROCESS_TITLE,
STATS,
STATS_MONITORING,
STATS_COLLECTOR,