Skip to content

Commit 3860cbf

Browse files
committed
docs: removed more mentions of setup
1 parent 18eabdf commit 3860cbf

File tree

12 files changed

+21
-68
lines changed

12 files changed

+21
-68
lines changed

dirac.cfg

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ Operations
10431043
# RMSMonitoring = ...
10441044
}
10451045
# This is the default section of operations.
1046-
# Any value here can be overwriten in the setup specific section
1046+
# Any value here can be overwriten in the VO specific section
10471047
Defaults
10481048
{
10491049
# Flag for globally disabling the use of the SecurityLogging service
@@ -1188,9 +1188,4 @@ Operations
11881188
}
11891189
}
11901190
}
1191-
# Options in this section will only be used when running with the
1192-
# <MySetup> setup
1193-
<MySetup>
1194-
{
1195-
}
11961191
}

docs/source/AdministratorGuide/HowTo/SystemAdministratorInterface.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ The following command shows information about the host setup and currently used
4040

4141
volhcb03.cern.ch >show info
4242

43-
Setup: LHCb-Certification
4443
DIRAC version: v5r12-pre9
4544
LHCb version v5r11p10
4645
LHCbWeb version v1r1
@@ -64,11 +63,11 @@ The status of the installed components can be obtained like::
6463

6564
volhcb01.cern.ch> show status
6665

67-
System Name Type Setup Installed Runit Uptime PID
68-
--------------------------------------------------------------------------------------------------------------------
69-
ResourceStatus ResourceStatus service SetUp Installed Down 2532910 0
70-
WorkloadManagement SandboxStore service SetUp Installed Run 8390 20510
71-
WorkloadManagement JobMonitoring service SetUp Installed Run 8390 20494
66+
System Name Type Installed Runit Uptime PID
67+
-----------------------------------------------------------------------------------------------------------
68+
ResourceStatus ResourceStatus service Installed Down 2532910 0
69+
WorkloadManagement SandboxStore service Installed Run 8390 20510
70+
WorkloadManagement JobMonitoring service Installed Run 8390 20494
7271
...
7372

7473
The output of the command shows for each component its system, name and type as well as the status information:
@@ -78,7 +77,7 @@ The output of the command shows for each component its system, name and type as
7877
Runit system
7978

8079

81-
Show setup command allows administrators to know which components, Services and Agents are setup up in the host::
80+
Show setup command allows administrators to know which components, Services and Agents are setup in the host::
8281

8382
mardirac1.in2p3.fr >show setup
8483
{'Agents': {'Configuration': ['CE2CSAgent'],

docs/source/AdministratorGuide/Resources/catalog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Catalogs represent the namespace in DIRAC. They are queried based on the LFN. Ev
99
The definition of catalogs is shared between two sections:
1010

1111
* `/Resources/FileCatalogs`: this describes the catalog, how to access it, and all its options
12-
* `/Operations/<vo/setup>/Services/Catalogs/`: this describes how we use the catalog.
12+
* `/Operations/<vo>/Services/Catalogs/`: this describes how we use the catalog.
1313

1414
Resources
1515
---------

docs/source/AdministratorGuide/Systems/DataManagement/fts3.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ They named this strategy *MultiHop* |trade|. It consists of turning a transfer `
173173

174174
DIRAC supports one intermediate hop (note: not that it would be very hard to implement any number, but having to implement that feature to transfer between two WLCG sites is already afflicting enough, so let's not overdo it). The choice of the intermediate SE is done in the FTS3Plugin, so feel free to customize it (see above).
175175

176-
The configuration of multihop is done in the form of a ``[source][destination]`` matrix in ``Operations/<vo/setup>/DataManagement/MultiHopMatrixOfShame``. You can:
176+
The configuration of multihop is done in the form of a ``[source][destination]`` matrix in ``Operations/<vo/DataManagement/MultiHopMatrixOfShame``. You can:
177177

178178
* Use specific SE Names
179179
* Use ``BaseSE`` names

docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ For example::
5656

5757
The following option can be set in `Systems/Monitoring/Databases/MonitoringDB`:
5858

59-
*IndexPrefix*: Prefix used to prepend to indexes created in the ES instance. If this
60-
is not present in the CS, the indices are prefixed with the setup name.
59+
*IndexPrefix*: Prefix used to prepend to indexes created in the ES instance.
6160

6261
For each monitoring types managed, the Period (how often a new index is created)
6362
can be defined with::

docs/source/AdministratorGuide/Systems/Transformation/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Configuration
127127

128128
* **Operations**
129129

130-
* In the Operations/[VO]/[SETUP]/Transformations or Operations/Defaults/Transformations section, *Transformation Types* must be added
130+
* In the Operations/[VO]/Transformations or Operations/Defaults/Transformations section, *Transformation Types* must be added
131131
* By default, the WorkflowTaskAgent will treat all the *DataProcessing* transformations and the RequestTaskAgent all the *DataManipulation* ones
132132
* An example of working configuration is give below::
133133

docs/source/DeveloperGuide/AddingNewComponents/Utilities/CSHelpers/Operations/index.rst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,30 @@
22
Helper for accessing /Operations
33
==================================
44

5-
*/Operations* section is *VO* and *setup* aware. That means that configuration for different *VO/setup* will have a different CS path:
5+
*/Operations* section is *VO* aware. That means that configuration for different *VO* will have a different CS path:
66

77
* For multi-VO installations */Operations/<vo>* should be used.
88
* For single-VO installations */Operations* should be used.
99

10-
In any case, there is the possibility to define a default configuration, that is valid for all the *setups*. The *Defaults* keyword can be used instead of the setup. For instance */Operations/myvo/Defaults*.
10+
In any case, there is the possibility to define a default configuration, for instance */Operations/myvo/Defaults*.
11+
Take a look at :ref:`dirac-operations-cs` for further info.
1112

12-
Parameters defined for a specific setup take precedence over parameters defined for the *Defaults* setup. Take a look at :ref:`dirac-operations-cs` for further info.
13-
14-
To ease accessing the */Operations* section a helper has been created. This helper receives the *VO* and the *Setup* at instantiation and
15-
will calculate the *Operations* path automatically. Once instanced it's used as the *gConfig* object. An example would be:
13+
To ease accessing the */Operations* section a helper has been created. This helper receives the *VO* and will calculate the *Operations* path automatically. Once instanced it's used as the *gConfig* object. An example would be:
1614

1715
.. code-block:: python
1816
1917
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
2018
21-
ops = Operations(vo="dirac", setup="Production")
19+
ops = Operations(vo="myVO")
2220
#This would check the following paths and return the first one that is defined
23-
# 1.- /Operations/dirac/Production/JobScheduling/CheckJobLimits
24-
# 2.- /Operations/dirac/Defaults/JobScheduling/CheckJobLimits
21+
# 1.- /Operations/myVO/JobScheduling/CheckJobLimits
22+
# 2.- /Operations/Defaults/JobScheduling/CheckJobLimits
2523
# 3.- Return True
2624
2725
print(ops.getValue("JobScheduling/CheckJobLimits", True))
2826
2927
30-
It's not necessary to define the *VO* if a group is known. The helper can extract the *VO* from the group. It's also possible to skip the setup parameter and let it discover itself. For instance:
28+
It's not necessary to define the *VO* if a group is known. The helper can extract the *VO* from the group. For instance:
3129

3230
.. code-block:: python
3331

docs/source/DeveloperGuide/DevelopmentEnvironment/DeveloperInstallation/interactingWithProductionSetups.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ So, the only real thing that you need to have is:
1515

1616
The last 2 bullets can be achieved with the following command::
1717

18-
dirac-configure -S MyProductionSetup -C dips://some.whe.re:9135/Configuration/Server --SkipCAChecks
18+
dirac-configure -C dips://some.whe.re:9135/Configuration/Server --SkipCAChecks
1919

2020
Or simply by manual editing the dirac.cfg file.
2121

docs/source/UserGuide/WebAppUserGuide/index.rst

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ Format of the URL:
3939

4040
#. https://: protocol
4141
#. lhcb-portal-dirac.cern.ch/DIRAC/: host.
42-
#. s:LHCb-Production: DIRAC setup.
4342
#. g:lhcb_prmgr : role
4443
#. theme=Grey: it is the look and feel.
4544
#. &url_state=1: it is desktop or application.
@@ -309,37 +308,7 @@ You have to click on the **Settings** widget:
309308
You can define the following:
310309

311310
* Group you can change the role
312-
* Setup: you can switch between different setups.
313311
* Theme you can change the look and feel and also you can switch between Tab and Desktop themes.
314312

315-
We have 3 look and feels:
316-
317-
#. Grey it is the default
318-
#. Neptune
319-
#. Classic
320-
321313
You can automatically change the applications using *Automatic tab change* Note: After you set it you have to save the desktop.
322314
Consequently, you can not have automatic tab change in the *Default* desktop.
323-
324-
**Grey**
325-
326-
.. image:: images/grey.png
327-
:scale: 30 %
328-
:alt: Grey look and feel.
329-
:align: center
330-
331-
332-
**Neptune**
333-
334-
.. image:: images/neptune.png
335-
:scale: 30 %
336-
:alt: Neptune look and feel.
337-
:align: center
338-
339-
340-
**Classic**
341-
342-
.. image:: images/classic.png
343-
:scale: 30 %
344-
:alt: Classic look and feel.
345-
:align: center

docs/source/UserGuide/WebPortalReference/Overview/index.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DIRAC Web Portal is a Web application which provides access to all the aspects o
88
Description
99
========================
1010

11-
All pages have two toolbars, one on the top and another at the bottom of the pages that contain the main navigation widgets. The top toolbar contains the main menu and reflects the logical structure of the Portal. It also allows to select active DIRAC setup. The bottom toolbar allows users to select their active group and displays the identity the user is connected with.
11+
All pages have two toolbars, one on the top and another at the bottom of the pages that contain the main navigation widgets. The top toolbar contains the main menu and reflects the logical structure of the Portal. The bottom toolbar allows users to select their active group and displays the identity the user is connected with.
1212

1313
The mostly used layout within our Web Portal is a table on the right side of the page and a side bar on the left. Almost all data that needs to be displayed can be represented as two-dimensional matrix using a table widget. This widget has a built-in pagination mechanism and is very customizable. As a drawback, it is a bit slow to load the data into the table. On an average desktop hardware, tables with more than 100 elements can be slow to display the data.
1414

@@ -22,7 +22,6 @@ The mostly used layout within our Web Portal is a table on the right side of the
2222
2. **Selections**: Shows a set of selectors than permits generate customs selections.
2323
3. **Buttons to open/collapse panels**: Permit open or collapse left menu.
2424
4. **Actions to perform for job(s)**: These actions permits select all, select none, reset, kill or submit
25-
5. **Menu to change DIRAC setup**: Users can change between different setups.
2625
6. **Current location**: Indicates where the user is located inside the portal.
2726
7. **Buttons to submit or reset the form**: After options are selected its possible to submit and execute the selection or reset the selectors.
2827
8. **Pagination controls**: Permits navigate between the pages, and also show in which page the user is navigating.

0 commit comments

Comments
 (0)